diff options
| author | David S. Miller <davem@davemloft.net> | 2022-09-04 11:24:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-09-04 11:24:34 +0100 |
| commit | 9837ec955b46b62d1dd2d00311461a950c50a791 (patch) | |
| tree | b051c1b72a8f4dfaf60000da3e3a46534b1f4fea /net/mac80211/scan.c | |
| parent | aa3fab0110580aaeb9422e73b031822990651552 (diff) | |
| parent | c087f9fcd0fb53422a9a6c865dbf7dc89b6aecdb (diff) | |
Merge tag 'wireless-next-2022-09-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next
Johannes Berg says:
====================
drivers
- rtw89: large update across the map, e.g. coex, pci(e), etc.
- ath9k: uninit memory read fix
- ath10k: small peer map fix and a WCN3990 device fix
- wfx: underflow
stack
- the "change MAC address while IFF_UP" change from James
we discussed
- more MLO work, including a set of fixes for the previous
code, now that we have more code we can exercise it more
- prevent some features with MLO that aren't ready yet
(AP_VLAN and 4-address connections)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index c4f2aeb31da3..0e8c4f48c36d 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -485,7 +485,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) /* Set power back to normal operating levels. */ ieee80211_hw_config(local, 0); - if (!hw_scan) { + if (!hw_scan && was_scanning) { ieee80211_configure_filter(local); drv_sw_scan_complete(local, scan_sdata); ieee80211_offchannel_return(local); |