Date: Tue, 17 May 2022 22:36:47 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 892b1874ace0 - main - net80211: remove (optional) RSN from preobereq Message-ID: <202205172236.24HMalmM030689@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=892b1874ace0245a08b0764a45622fbdee3668a9 commit 892b1874ace0245a08b0764a45622fbdee3668a9 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2022-04-12 22:01:27 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2022-05-17 22:33:10 +0000 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 --- sys/net80211/ieee80211_output.c | 4 ---- 1 file changed, 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); /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205172236.24HMalmM030689>