P2P: Do not create a P2P Device interface if P2P is disabled
authorIlan Peer <ilan.peer@intel.com>
Wed, 22 Apr 2015 10:13:18 +0000 (13:13 +0300)
committerJouni Malinen <j@w1.fi>
Thu, 23 Apr 2015 22:22:15 +0000 (01:22 +0300)
Do not add the dedicated P2P Device interface in case P2P is disabled in
the configuration file or globally.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
wpa_supplicant/wpa_supplicant.c

index b96fd8e..950fdfa 100644 (file)
@@ -4386,6 +4386,7 @@ struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
 
 #ifdef CONFIG_P2P
        if (wpa_s->global->p2p == NULL &&
+           !wpa_s->global->p2p_disabled && !wpa_s->conf->p2p_disabled &&
            (wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE) &&
            wpas_p2p_add_p2pdev_interface(wpa_s, iface->conf_p2p_dev) < 0) {
                wpa_printf(MSG_INFO,