diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2013-11-19 12:39:29 +0200 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-06-12 14:07:29 -0700 |
| commit | 89a35a70e4333d378e35433987f79437a1861b2f (patch) | |
| tree | 28acf3c303fc155021e6d074ab95219f4f8a4071 | |
| parent | 89bce6568b26b3fefa6d2ac1e75c678c4a176db3 (diff) | |
| download | android_external_wpa_supplicant_8-89a35a70e4333d378e35433987f79437a1861b2f.tar.gz android_external_wpa_supplicant_8-89a35a70e4333d378e35433987f79437a1861b2f.tar.bz2 android_external_wpa_supplicant_8-89a35a70e4333d378e35433987f79437a1861b2f.zip | |
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.
Change-Id: I0efd3caf3b4c86033f7900306cba34500bea6e28
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Git-commit: 1b665cbf513bd56e6e4f8bde4c2d4dcec774ea6f
Git-repo: git://w1.fi/srv/git/hostap.git
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 88f71bd1..9f5073cf 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -4231,7 +4231,8 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr, res = wpas_p2p_setup_freqs(wpa_s, freq, &force_freq, &pref_freq); 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); |