[PATCH] P2P: Fix association frequency conflict check with BSS_SELECTION
Stan Wu
stanccwu at gmail.com
Fri Nov 20 00:18:21 PST 2026
From: Stan Wu <stan.cc.wu at realtek.com>
When WPA_DRIVER_FLAGS_BSS_SELECTION (e.g., WIPHY_FLAG_SUPPORTS_FW_ROAM)
is enabled, wpas_start_assoc_cb() intentionally skips setting
params.freq.freq (leaving it 0) when ssid->bssid_set is unset so the
driver is not restricted to a single channel, and instead provides the
target BSS frequency in params.freq_hint (see commits 22628eca3440 and
7ac7fd43aa6e).
However, the single-channel concurrency check in wpas_start_assoc_cb()
still compares the active shared radio frequency only against
params.freq.freq. As a result, whenever another interface (such as a P2P
group) is active, reconnecting an infrastructure STA even on the exact
same channel triggers a false conflict ('Assoc conflicting freq found
(<freq> != 0)') and passes 0 to wpas_p2p_handle_frequency_conflicts().
Fall back to params.freq_hint when params.freq.freq is 0, and require
target_freq > 0 before flagging a frequency conflict so an unspecified
target frequency (0) is not treated as a valid channel. Note that
sme_send_authentication() unconditionally sets params.freq = bss->freq
and is not affected.
Signed-off-by: Stan Wu <stan.cc.wu at realtek.com>
---
wpa_supplicant/wpa_supplicant.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 74fad8678..2eaa55940 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -5969,13 +5969,17 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
*/
if (wpa_s->num_multichan_concurrent < 2) {
int freq, num;
+ int target_freq = params.freq.freq ? params.freq.freq :
+ params.freq_hint;
+
num = get_shared_radio_freqs(wpa_s, &freq, 1, false);
- if (num > 0 && freq > 0 && freq != params.freq.freq) {
+ if (num > 0 && freq > 0 && target_freq > 0 &&
+ freq != target_freq) {
wpa_printf(MSG_DEBUG,
"Assoc conflicting freq found (%d != %d)",
- freq, params.freq.freq);
+ freq, target_freq);
if (wpas_p2p_handle_frequency_conflicts(
- wpa_s, params.freq.freq, ssid) < 0) {
+ wpa_s, target_freq, ssid) < 0) {
wpas_connect_work_done(wpa_s);
os_free(wpa_ie);
return;
--
2.22.0.windows.1
More information about the Hostap
mailing list