Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jun 2022 17:19:21 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1e80cda00210 - stable/13 - net80211: remove (optional) RSN from preobereq
Message-ID:  <202206031719.253HJLYv065649@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=1e80cda00210c5aa61dd61d0feb2d0457710c917

commit 1e80cda00210c5aa61dd61d0feb2d0457710c917
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2022-04-12 22:01:27 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2022-06-03 16:56:13 +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
    Okayed by:      adrian
    Differential Revision: https://reviews.freebsd.org/D34893
    
    (cherry picked from commit 892b1874ace0245a08b0764a45622fbdee3668a9)
---
 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?202206031719.253HJLYv065649>