d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LinuxKPI: 802.11 scan update

Browse Source 
Realtek's rtw88 is returning a hard-coded 1 in case they cannot
hw_scan (fw not advertising it).  In that case if we want any scan
to run we need to fall-back to sw scan.  Start dealing with this.
Long-term we probably need to keep internal state.

MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2022-02-16 03:00:34 +00:00
parent 26b08c5d21
commit d3ef7fb459
1 changed files with 18 additions and 5 deletions

23
sys/compat/linuxkpi/common/src/linux_80211.c

@ -1899,13 +1899,13 @@ lkpi_ic_scan_start(struct ieee80211com *ic)
ss = ic->ic_scan;
vap = ss->ss_vap;
if (vap->iv_state != IEEE80211_S_SCAN) {
/* Do not start a scan for now. */
IMPROVE("We need to be able to scan if not in S_SCAN");
return;
}
hw = LHW_TO_HW(lhw);
if ((ic->ic_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) == 0) {
sw_scan:
lvif = VAP_TO_LVIF(vap);
vif = LVIF_TO_VIF(lvif);
@ -1965,6 +1965,10 @@ lkpi_ic_scan_start(struct ieee80211com *ic)
hw_req->req.ie_len = ;
hw_req->req.ie = ;
#endif
#if 0
hw->wiphy->max_scan_ie_len
hw->wiphy->max_scan_ssids
#endif
hw_req->req.n_channels = nchan;
cpp = (struct linuxkpi_ieee80211_channel **)(hw_req + 1);
@ -2010,12 +2014,21 @@ lkpi_ic_scan_start(struct ieee80211com *ic)
vif = LVIF_TO_VIF(lvif);
error = lkpi_80211_mo_hw_scan(hw, vif, hw_req);
if (error != 0) {
ic_printf(ic, "ERROR: %s: hw_scan returned %d\n",
__func__, error);
ieee80211_cancel_scan(vap);
free(hw_req->ies.common_ies, M_80211_VAP);
free(hw_req, M_LKPI80211);
lhw->hw_req = NULL;
/*
* XXX-SIGH magic number.
* rtw88 has a magic "return 1" if offloading scan is
* not possible. Fall back to sw scan in that case.
*/
if (error == 1)
goto sw_scan;
ic_printf(ic, "ERROR: %s: hw_scan returned %d\n",
__func__, error);
ieee80211_cancel_scan(vap);
}
}
}