Skip to content

Commit 05dcb8b

Browse files
ilanpeer2jmberg-intel
authored andcommitted
cfg80211: Do not warn on same channel at the end of CSA
When cfg80211_update_assoc_bss_entry() is called, there is a verification that the BSS channel actually changed. As some APs use CSA also for bandwidth changes, this would result with a kernel warning. Fix this by removing the WARN_ON(). Signed-off-by: Ilan Peer <[email protected]> Signed-off-by: Luca Coelho <[email protected]> Link: https://lore.kernel.org/r/iwlwifi.20200326150855.96316ada0e8d.I6710376b1b4257e5f4712fc7ab16e2b638d512aa@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent a0761a3 commit 05dcb8b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

net/wireless/scan.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2022,7 +2022,11 @@ void cfg80211_update_assoc_bss_entry(struct wireless_dev *wdev,
20222022

20232023
spin_lock_bh(&rdev->bss_lock);
20242024

2025-
if (WARN_ON(cbss->pub.channel == chan))
2025+
/*
2026+
* Some APs use CSA also for bandwidth changes, i.e., without actually
2027+
* changing the control channel, so no need to update in such a case.
2028+
*/
2029+
if (cbss->pub.channel == chan)
20262030
goto done;
20272031

20282032
/* use transmitting bss */

0 commit comments

Comments
 (0)