From f2b3f4de49606a6e21c46fb6d85e262ad3ce88a7 Mon Sep 17 00:00:00 2001 From: Sreenath Sharma Date: Sat, 31 Aug 2013 11:59:05 +0300 Subject: [PATCH] P2P: Allow P2P functionality to be disabled per interface By default, P2P is initialized for all driver interfaces and this makes P2P getting initialized for non-P2P station interface if the supplicant is started first on this interface. If an interface is dedicated for non-P2P station mode, it is now possible to disable P2P initialization by adding 'p2p_disabled=1' in the configuration file of non-P2P station interface, irrespective of the order in which supplicant is started. Signed-hostap: Sreenath Sharma --- wpa_supplicant/p2p_supplicant.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index aad12bb3f..4b0e0eeb2 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -3114,6 +3114,9 @@ int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s) unsigned int r; int i; + if (wpa_s->conf->p2p_disabled) + return 0; + if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE)) return 0;