From: Jouni Malinen Date: Tue, 9 Dec 2014 23:54:27 +0000 (+0200) Subject: P2P: Allow cross connection on the parent interface X-Git-Tag: hostap_2_4~840 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42a697256e030debf4c76164f1541dab929d9e35;p=thirdparty%2Fhostap.git P2P: Allow cross connection on the parent interface Previously, any P2P capable interface was skipped in cross connection uplink consideration. However, this ends up skipping more or less all nl80211-based driver cases now since they mark the main interface P2P capable. Relax this rule to allow the parent interface to be used as the non-P2P station interface for cross connection purposes. Signed-off-by: Jouni Malinen --- diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 267b59ba6..4c63b1f8a 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -6734,7 +6734,8 @@ static void wpas_p2p_cross_connect_setup(struct wpa_supplicant *wpa_s) if (iface->drv_flags & WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE) continue; - if (iface->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) + if ((iface->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE) && + iface != wpa_s->parent) continue; wpa_s->cross_connect_enabled = 1;