upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 16:50:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

LinuxKPI: 802.11: deal with scan_ie_len

Browse source 
We only need to reserve the extra space for DSSS if
NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES is set, so add the conditional.
Also add checks in case scan_ie_len will grow beyond the maximum.
Given this is currently unlikely, leave the cleanup for later as
some other restructuring should be done first.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
Reviewed by:	cc
Differential Revision: https://reviews.freebsd.org/D42425
This commit is contained in:
Bjoern A. Zeeb 2023-10-27 20:41:43 +00:00
parent 5856761fd5
commit 78ca45df31
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/compat/linuxkpi/common/src/linux_80211.c
View file

@ -3919,20 +3919,30 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw)
lhw->scan_ie_len = 2 + IEEE80211_RATE_SIZE;
if (lhw->max_rates > IEEE80211_RATE_SIZE)
lhw->scan_ie_len += 2 + (lhw->max_rates - IEEE80211_RATE_SIZE);
/*
* net80211 does not seem to support the DSSS Parameter Set but some of
* the drivers insert it so calculate the extra fixed space in.
*/
lhw->scan_ie_len += 2 + 1;
if (hw->wiphy->features & NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES) {
/*
* net80211 does not seem to support the DSSS Parameter Set but
* some of the drivers insert it so calculate the extra fixed
* space in.
*/
lhw->scan_ie_len += 2 + 1;
}
/* Reduce the max_scan_ie_len "left" by the amount we consume already. */
if (hw->wiphy->max_scan_ie_len > 0)
if (hw->wiphy->max_scan_ie_len > 0) {
if (lhw->scan_ie_len > hw->wiphy->max_scan_ie_len)
goto err;
hw->wiphy->max_scan_ie_len -= lhw->scan_ie_len;
}
if (bootverbose)
ieee80211_announce(ic);
return (0);
err:
IMPROVE("TODO FIXME CLEANUP");
return (-EAGAIN);
}
void