git: 5f88604cf7d9 - stable/13 - LinuxKPI: 802.11: remove special handling for (*ic_scan_curchan)

The branch stable/13 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=5f88604cf7d9df1edbc662c4278e01476534f3ef

commit 5f88604cf7d9df1edbc662c4278e01476534f3ef
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2022-03-24 17:32:07 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2022-03-27 18:12:36 +0000

    LinuxKPI: 802.11: remove special handling for (*ic_scan_curchan)
    
    Remove the originally disabling of (*ic_scan_curchan), which for iwlwifi
    was not needed.  The condition always only was approximate.
    
    A set IEEE80211_FEXT_SCAN_OFFLOAD will still prevent net80211 from sending
    probe_reqs if handled by driver/firmware.
    ic_scan_curchan will re-arm the timer to switch channels for drivers which
    need it (e.g., rtw88, but that again is a NOP for iwlwifi).
    
    So enabling ic_scan_curchan should not have further side effects for iwlwifi
    but allow other drivers to work better.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 321735f451d1eaa710a768d9e35ff87acb089d35)
---
 sys/compat/linuxkpi/common/src/linux_80211.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
index e1e2bbe02a03..727c0e276af9 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -2595,12 +2595,6 @@ lkpi_ic_scan_end(struct ieee80211com *ic)
 	}
 }
 
-static void
-lkpi_ic_scan_curchan_nada(struct ieee80211_scan_state *ss __unused,
-    unsigned long maxdwell __unused)
-{
-}
-
 static void
 lkpi_ic_set_channel(struct ieee80211com *ic)
 {
@@ -3373,9 +3367,6 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw)
 	ic->ic_parent = lkpi_ic_parent;
 	ic->ic_scan_start = lkpi_ic_scan_start;
 	ic->ic_scan_end = lkpi_ic_scan_end;
-	if (lhw->ops->hw_scan &&
-	    ieee80211_hw_check(hw, SINGLE_SCAN_ON_ALL_BANDS))
-		ic->ic_scan_curchan = lkpi_ic_scan_curchan_nada;
 	ic->ic_set_channel = lkpi_ic_set_channel;
 	ic->ic_transmit = lkpi_ic_transmit;
 	ic->ic_raw_xmit = lkpi_ic_raw_xmit;