--- /etc/wpa_supplicant/functions.sh	2012-03-13 23:11:24.000000000 +0000
+++ /tmp/func.sh	2013-12-19 21:45:02.819202818 +0000
@@ -953,7 +953,7 @@
 
 		ifupdown_lock
 
-		if [ -n "$IFSTATE_FILE" ] && grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
+		if [ -n "$IFSTATE_FILE" ] && grep -q "^$WPA_IFACE=" "$IFSTATE_FILE" && ! grep -q "^$WPA_IFACE=$WPA_LOGICAL_IFACE"; then
 			# Force settings over the unconfigured "master" IFACE
 			/sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
 		else