P2P: Fix WSC IE inclusion for P2P disabled case

wpas_wps_in_use() was forcing WPS to be enabled unconditionally if P2P
support was included in the build. This is not really the correct
behavior for the case when P2P has been disabled at runtime. Change the
code here to verify runtime configuration of P2P before forcing WPS to
be enabled. This allows WSC IE to be left out from Probe Request frames
when scanning for APs without P2P or WPS being in use.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 16f2bbf05c60b4994d1a9b07982830463f3f9de4..51358920801b82f1410aee6bec309317ed755681 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -71,10 +71,12 @@ static int wpas_wps_in_use(struct wpa_supplicant *wpa_s,
        }
 
 #ifdef CONFIG_P2P
-       wpa_s->wps->dev.p2p = 1;
-       if (!wps) {
-               wps = 1;
-               *req_type = WPS_REQ_ENROLLEE_INFO;
+       if (!wpa_s->global->p2p_disabled && wpa_s->global->p2p) {
+               wpa_s->wps->dev.p2p = 1;
+               if (!wps) {
+                       wps = 1;
+                       *req_type = WPS_REQ_ENROLLEE_INFO;
+               }
        }
 #endif /* CONFIG_P2P */