commit 7c5e12ada07c2f1334b29624adc97c7b6528db52
author Jouni Malinen <j@w1.fi> Fri Oct 05 11:38:36 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 05 11:38:36 2012 -0700
tree ef0520c46824bfae1d128351b25d586259cf4a90
parent 86b5c67993dea522f6cc2549c93f63b0eae05379
parent fe62849f4448ef74add320a067a88bce61ed0f80

am fe62849f: am 9d712833: P2P: Fix network removal to select correct block

* commit 'fe62849f4448ef74add320a067a88bce61ed0f80':
  P2P: Fix network removal to select correct block

wpa_supplicant/p2p_supplicant.c

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index a51254a..efc36cd 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -272,7 +272,7 @@
 		 */
 		ssid = wpa_s->conf->ssid;
 		while (ssid) {
-			if (ssid->p2p_group)
+			if (ssid->p2p_group && ssid->disabled != 2)
 				break;
 			ssid = ssid->next;
 		}