diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2022-04-12 22:01:27 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2022-05-17 22:33:10 +0000 |
| commit | 892b1874ace0245a08b0764a45622fbdee3668a9 (patch) | |
| tree | 652054ad7ff5916b4c07ed9459aee813a2e88e4c | |
| parent | c678572e7675c8de6d19fa925284a50f58358f35 (diff) | |
| download | src-892b1874ace0245a08b0764a45622fbdee3668a9.tar.gz src-892b1874ace0245a08b0764a45622fbdee3668a9.zip | |
net80211: remove (optional) RSN from preobereq
802.11i-2004 did not specify that RSN can be added to the probereq,
only to the proberesp (and others) yet it was added in what seems was
b032f27c365b992e9d8e42214183b39acfb8c6ac (multi-BSS support).
802.11-2020 does not list the IE either for probereq so remove it.
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
Okayed by: adrian
Differential Revision: https://reviews.freebsd.org/D34893
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index c6898810a694..50284da6f7d1 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -2435,7 +2435,6 @@ ieee80211_probereq_ie_len(struct ieee80211vap *vap, struct ieee80211com *ic) * prreq frame format * [tlv] ssid * [tlv] supported rates - * [tlv] RSN (optional) * [tlv] extended supported rates (if needed) * [tlv] HT cap (optional) * [tlv] VHT cap (optional) @@ -2444,8 +2443,6 @@ ieee80211_probereq_ie_len(struct ieee80211vap *vap, struct ieee80211com *ic) */ return ( 2 + IEEE80211_NWID_LEN + 2 + IEEE80211_RATE_SIZE - + ((vap->iv_flags & IEEE80211_F_WPA2 && vap->iv_rsn_ie != NULL) ? - vap->iv_rsn_ie[1] : 0) + ((rs->rs_nrates > IEEE80211_RATE_SIZE) ? 2 + (rs->rs_nrates - IEEE80211_RATE_SIZE) : 0) + (((vap->iv_opmode == IEEE80211_M_IBSS) && @@ -2493,7 +2490,6 @@ ieee80211_probereq_ie(struct ieee80211vap *vap, struct ieee80211com *ic, frm = ieee80211_add_ssid(frm, ssid, ssidlen); rs = ieee80211_get_suprates(ic, ic->ic_curchan); frm = ieee80211_add_rates(frm, rs); - frm = ieee80211_add_rsn(frm, vap); frm = ieee80211_add_xrates(frm, rs); /* |