From nobody Fri Jun 3 17:19:21 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EB4881BDA76B; Fri, 3 Jun 2022 17:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LF8kg4CsHz4Xbq; Fri, 3 Jun 2022 17:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654276763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OAF/wGm6gJFXtvbcFuZCG+H2RevWnAfyO1fDIMwbhFM=; b=Xexj/UVuU9/qtTaVdHK2bFCju13vKQudUJTLUoCj+C5zK6TA9+O1FmYJMGMinsGw3ZYg1i E0qBMHAQIbCaG2P9XgwmSnRcIahgN6tRSLRyhprGhZuk8/vm4CD2imRQjiSfypTjLjuoJ8 nMtmBBs0ke/syl4dVaDE/jmRSmWKkEgC2IsmIVqYXs2T07BeBPc7lhGZBNfs78EbSy9KJ9 96vF4uOkGN4LDKbcxf32w6OHRUxbpVliWjMAwBy7Tn77VsUJFyXrI5wo69yL9ADSH1PEds 6PLRBiImjPtocsgztYA0GOyT4WLQ+TUOOHHnpOAfUgnG0r19/Ta1qKNzI7xIBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7520F537D; Fri, 3 Jun 2022 17:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 253HJLp9065650; Fri, 3 Jun 2022 17:19:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253HJLYv065649; Fri, 3 Jun 2022 17:19:21 GMT (envelope-from git) Date: Fri, 3 Jun 2022 17:19:21 GMT Message-Id: <202206031719.253HJLYv065649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1e80cda00210 - stable/13 - net80211: remove (optional) RSN from preobereq List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e80cda00210c5aa61dd61d0feb2d0457710c917 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654276763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OAF/wGm6gJFXtvbcFuZCG+H2RevWnAfyO1fDIMwbhFM=; b=q8H66GEys44bKW2hqbBpcIfHoXfLLGboTgDnvVIMA3yyJUyMGO7A+yekWKYpgH5m1+TPSw U8WSnnb7yVqD+4ba0ZuN2PbYyBJxtYVIyVRM3sDSE9l7fllf/pOjUvQb94bfKxNYLqvC9I /U6Alw76RtpVl/Et0fMi9c93r1O95tFq5aMRT/U1+sBP+dcnWs3GA/Qp40Km8Nfdwr7pq4 RqD39o/NWqKhZitlpkUExAnLnjST7FDot29NJWKkithIvzfs/M0WpTTkdugMFHX76M7bUc wuw0ASDxQRjbNTxn3FUicHQmZPgXsB4X0OSdSPzQzCJLSJSYQOTtLqVfsrrwlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654276763; a=rsa-sha256; cv=none; b=IekhvPXpSyiofq3nvSy4yI6bKHuM869k8DdwOYTHSr/BVN9X6wcviUzeHWNyiauEFb6wdZ nICFpXXAnHOn0X5M3r8F1VhlQ2mtT4rgDEhw7R5VFmLq1MeOW5E/zupaBUYe6k/sXSIqb5 WopTrSdOaZ8J+CObzt70XNLQ3LsKcgfVob0P0YXbr0UaOqygQo+A9MeTHN2jPXzE7+gUmQ 8+OCEGMFnzHXv9aGi9pboYskNKHNjPclDXApzKutkW626hFJIuCrES9jcKhjg+RW0xW45b nE7EjgBGttrOOHB2U5O51QLfAvlh4LpKTcZ9cxZg+q1n+52GRnth8OBidIkJuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1e80cda00210c5aa61dd61d0feb2d0457710c917 commit 1e80cda00210c5aa61dd61d0feb2d0457710c917 Author: Bjoern A. Zeeb AuthorDate: 2022-04-12 22:01:27 +0000 Commit: Bjoern A. Zeeb 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); /*