diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2023-10-26 20:55:59 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2023-11-29 16:36:11 +0000 |
| commit | 73d3c2546007e54fb74cf08e61094a683b89d81d (patch) | |
| tree | 22cf82fde1df45cc7d8e57b05778a382d1f3c84c | |
| parent | 9f5f879220ab309e1315f7e3f2fb0af955458e3e (diff) | |
| download | src-73d3c2546007e54fb74cf08e61094a683b89d81d.tar.gz src-73d3c2546007e54fb74cf08e61094a683b89d81d.zip | |
net80211: add ieee80211_add_vhtcap_ch()
Add an implementation of ieee80211_add_vhtcap() which works based on
information derived from the vap (and possibly channel/band but we do
not support that yet in net80211). This is needed for scans request
information in LinuxKPI at times before we have a BSS.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 6c3ae01cc75afdd575f54289b2879a7c98d55bf6)
| -rw-r--r-- | sys/net80211/ieee80211_vht.c | 27 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_vht.h | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_vht.c b/sys/net80211/ieee80211_vht.c index 77611d9704a2..f7a13157150e 100644 --- a/sys/net80211/ieee80211_vht.c +++ b/sys/net80211/ieee80211_vht.c @@ -707,6 +707,33 @@ ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *ni) return (frm); } +/* + * Non-associated probe requests. Add VHT capabilities based on + * the current channel configuration. No BSS yet. + */ +uint8_t * +ieee80211_add_vhtcap_ch(uint8_t *frm, struct ieee80211vap *vap, + struct ieee80211_channel *c) +{ + struct ieee80211_vht_cap *vhtcap; + + memset(frm, 0, 2 + sizeof(*vhtcap)); + frm[0] = IEEE80211_ELEMID_VHT_CAP; + frm[1] = sizeof(*vhtcap); + frm += 2; + + /* 32-bit VHT capability */ + ADDWORD(frm, vap->iv_vht_cap.vht_cap_info); + + /* supp_mcs */ + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.rx_highest); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_mcs_map); + ADDSHORT(frm, vap->iv_vht_cap.supp_mcs.tx_highest); + + return (frm); +} + static uint8_t ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c) { diff --git a/sys/net80211/ieee80211_vht.h b/sys/net80211/ieee80211_vht.h index a3830ae13ba7..756c2e367485 100644 --- a/sys/net80211/ieee80211_vht.h +++ b/sys/net80211/ieee80211_vht.h @@ -50,6 +50,8 @@ void ieee80211_vht_node_leave(struct ieee80211_node *ni); uint8_t * ieee80211_add_vhtcap(uint8_t *frm, struct ieee80211_node *); uint8_t * ieee80211_add_vhtinfo(uint8_t *frm, struct ieee80211_node *); +uint8_t *ieee80211_add_vhtcap_ch(uint8_t *, struct ieee80211vap *, + struct ieee80211_channel *); void ieee80211_vht_update_cap(struct ieee80211_node *, const uint8_t *, const uint8_t *); |