aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2012-09-25 10:36:36 +0200
committerArik Nemtsov <arik@wizery.com>2012-09-25 10:36:36 +0200
commit4e69322725093ebd07be1c874c22483827074696 (patch)
tree86358869519f165bed914746bc39ecf1df47d95e
parent326e560fb8f6a93fb7067be167c5f4dc870aa026 (diff)
downloadexternal_wpa_supplicant_8_ti-4e69322725093ebd07be1c874c22483827074696.zip
external_wpa_supplicant_8_ti-4e69322725093ebd07be1c874c22483827074696.tar.gz
external_wpa_supplicant_8_ti-4e69322725093ebd07be1c874c22483827074696.tar.bz2
P2P: correct p2p_mult_chan operation (SQUASH)
Should be squashed with: commit 61d59eaa7ebf59c926d40b00228e227b3d27f8c9 Author: Arik Nemtsov <arik@wizery.com> Date: Mon Sep 24 17:39:23 2012 +0200 P2P: add conf param to prefer p2p multi channel Reported-by: Eyal Shapira <eyal@wizery.com> Signed-off-by: Arik Nemtsov <arik@wizery.com>
-rw-r--r--wpa_supplicant/p2p_supplicant.c2
1 files changed, 1 insertions, 1 deletions
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 &&