From 1b665cbf513bd56e6e4f8bde4c2d4dcec774ea6f Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 19 Nov 2013 12:39:29 +0200 Subject: [PATCH] P2P: Fix channel preference use for MCC p2p_connect Only force_freq was used in the wpas_p2p_set_own_freq_preference() call which allowed the P2P module channel re-selection to ignore the preference for using a channel we are already using. Fix this by setting either force_freq or pref_freq as the preference based on which one is set. This allows p2p_ignore_shared_freq parameter to be used whether to prefer the shared frequency in this case. Signed-hostap: Jouni Malinen --- wpa_supplicant/p2p_supplicant.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 407f3e4d4..963a0b806 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -4313,7 +4313,8 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr, go_intent == 15); if (res) return res; - wpas_p2p_set_own_freq_preference(wpa_s, force_freq); + wpas_p2p_set_own_freq_preference(wpa_s, + force_freq ? force_freq : pref_freq); wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);