From 4e69322725093ebd07be1c874c22483827074696 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Tue, 25 Sep 2012 10:36:36 +0200 Subject: P2P: correct p2p_mult_chan operation (SQUASH) Should be squashed with: commit 61d59eaa7ebf59c926d40b00228e227b3d27f8c9 Author: Arik Nemtsov Date: Mon Sep 24 17:39:23 2012 +0200 P2P: add conf param to prefer p2p multi channel Reported-by: Eyal Shapira Signed-off-by: Arik Nemtsov --- wpa_supplicant/p2p_supplicant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index bad6c5a..5e0edfd 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -3264,7 +3264,7 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr, return ret; } - if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT) && + if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT) || !wpa_s->conf->p2p_multi_chan) { if (wpa_s->current_ssid && wpa_drv_get_bssid(wpa_s, bssid) == 0 && -- cgit v1.1