From nobody Tue May 17 22:36:47 2022 X-Original-To: dev-commits-src-all@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 BE2C81B3BB8E; Tue, 17 May 2022 22:36:47 +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 4L2rZl50pjz4rkd; Tue, 17 May 2022 22:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652827007; 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=hF070ts/FptZBY57mXMRENVcYnAvqsVRjKZJL1XhV9E=; b=YcHznLZmSQPlSMrptOQXpQbPefWlBmSpv9KSsiuz+6tD3vBit7w2BAFZQK5Iqh2ye87Rqj ZIHz6Y9EWLSqcjkMMFSUNrs1cjLduUAKPonQYtU/ArsAlpZMfTQ+bjVWu0CCwtrXhApG3F m1pGryMOmsX1N83jfYeUUsObCUFGADKq/4P0ZTft13o4Wsw+SKnQtYa5XXAYziQ0cJv7Zc sm7S8015f1PU8KzeOBMLSTCsF46qRfWW2/GodZOrGrwJvDuU7AufcMwvubvT3ohmLzRZe2 JIugW0tWOUHUKrzOY7ja3ZG3FF1VpwPAsK9Itzi3XUj4zoZSPliD3bvtcsECzw== 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 877291D5A9; Tue, 17 May 2022 22:36:47 +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 24HMal8E030690; Tue, 17 May 2022 22:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HMalmM030689; Tue, 17 May 2022 22:36:47 GMT (envelope-from git) Date: Tue, 17 May 2022 22:36:47 GMT Message-Id: <202205172236.24HMalmM030689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 892b1874ace0 - main - net80211: remove (optional) RSN from preobereq List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 892b1874ace0245a08b0764a45622fbdee3668a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652827007; 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=hF070ts/FptZBY57mXMRENVcYnAvqsVRjKZJL1XhV9E=; b=c5GwJOtx0+XJJDhESdROsmgniYSExjVJahW2h3fnAEN0J3c5H8lJGLZ8AtG/KWQyrOz9t+ i2lVaV3yqIHvrubVVyzuNUi8Dy+jk2hB/wqC92DEHUiz+miwN7g0QLZIDru+r6LEXfdhwa c3le3CxLWpscm0ou/3h0GacXdzieHMMO5Cfihgv2BjpzDgiRl246Qgp9QuDXdIramR56Jg cIHQ4dzue76Pbz1s8lH+QPquXQUYEVLW2ApJ1kXMZhLXrZ6IXF2XRM1Cz53IACqo2/8vJK yg4a8Iv3mP5eC0D9IDXY8ad7RLzrP/UdOal+ANKBpyPG83x0mOyTtOE3LMnQEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652827007; a=rsa-sha256; cv=none; b=WQhS6EsvwuV6LN6EKYlwzwNIolCWPll97KcPkO2Y0PYCRdz2ZEzur8oQGADcmVurK5vl53 mwzShrlE3ccaKwXi/6TTiuYDcVt128LS+YwWvqf2pA0HUISzDessTje1DIdYWxgln58tcD EO4KRLKhxOWwFoDzCt/pWYKjVIW+B1jXD3dQBBCHF3+/Vk13w8CUEe9n8MYnFcEAZKI4lj IbdQSURjr/omYKNH21hDQr69Id0wvLdhW2do7hE7IQZPcIFG7I7uVHaaI8JdqrHYcg/h1b DmqxqdEKBVQKkGQIZqywuqZurLWtpvpkaMTXei2ZAfsyxM9BPr3LUHEBJ4ZiIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=892b1874ace0245a08b0764a45622fbdee3668a9 commit 892b1874ace0245a08b0764a45622fbdee3668a9 Author: Bjoern A. Zeeb AuthorDate: 2022-04-12 22:01:27 +0000 Commit: Bjoern A. Zeeb 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); /*