From 28fa4eb2b2dd971321e49591aade07d56695cf3e Mon Sep 17 00:00:00 2001 From: Rashmi Ramanna Date: Tue, 13 May 2014 16:14:18 +0530 Subject: [PATCH] P2P: Fix scan optimization for GO during persistent group invocation Commit 41d5ce9e0b7b37dd84fbf3c1aa5ed571c32321d4 was intended to scan for GO on the negotiated channel for few iterations, but it did not work correctly due to incorrect operator being used. Fix this by requiring both conditions to be met for the single channel scan. Signed-off-by: Jouni Malinen --- wpa_supplicant/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index bc0daebc0..4d96e82cd 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -332,7 +332,7 @@ static void wpa_supplicant_optimize_freqs( * Optimize scan based on GO information during persistent * group reinvocation */ - if (wpa_s->p2p_in_invitation < 5 || + if (wpa_s->p2p_in_invitation < 5 && wpa_s->p2p_invite_go_freq > 0) { wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Scan only GO preferred frequency %d MHz during invitation", wpa_s->p2p_invite_go_freq);