From: Arend van Spriel Date: Sun, 30 Jun 2013 07:48:44 +0000 (+0300) Subject: P2P: Ignore p2p_no_group_iface when driver advertizes P2P_DEVICE support X-Git-Tag: aosp-kk-from-upstream~155 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb4028f165bce441ce55527f05617fe09b0ddc36;p=thirdparty%2Fhostap.git P2P: Ignore p2p_no_group_iface when driver advertizes P2P_DEVICE support Setting p2p_no_group_iface means 'use P2P management interface as P2P connection interface' because it attempts to change the interface type. The P2P_DEVICE is a dedicated interface and can not be changed. As such ignore the configuration option. Signed-hostap: Arend van Spriel --- diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index e5aeef9ac..b0ebaaeb1 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -3225,7 +3225,8 @@ void wpas_p2p_deinit_global(struct wpa_global *global) static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s) { - if (wpa_s->conf->p2p_no_group_iface) + if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE) && + wpa_s->conf->p2p_no_group_iface) return 0; /* separate interface disabled per configuration */ if (wpa_s->drv_flags & (WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE |