From nobody Fri Apr 14 15:22:23 2023 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 4PygDJ14h0z45Rrf; Fri, 14 Apr 2023 15:22:24 +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 4PygDJ08Hkz3sZn; Fri, 14 Apr 2023 15:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485744; 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=EW8Urr/uwXpp+jQPaPBkIY94HGDvVQoj4L+9U1vp+Ok=; b=E+O2beCac6kN8G1Z/XU2jaeMV0fyXZVMHDiRUJec1ViS0OQwGJbNqMzeCjT1kUtDd9V9Pv Qx7MAsj8GsiFMX1n7eLZUrZdvWzS4kMZwbWIpHQn+GmtmZ14Og3OfPo+Kubq/Z3EID4CsJ OS0XJoV9nFCT3fR9nmTUJTwznf6WgkyCTW3VHfxZRR5p3ZFaiFzMHB1FIJH3IzP5yc0Yzx eeDndfPxCbApTOyvJWP9/Di7RulDvyL0ApvwblIdGSpeVvWGz1eJs7mMY+LewM+o/HNbZV 4IO8zotEqEjHdka1R8Bl4DGSPb68134LlcgFPscTZdD3E3ISoN+akjH6hX6o4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681485744; 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=EW8Urr/uwXpp+jQPaPBkIY94HGDvVQoj4L+9U1vp+Ok=; b=khsNTH4zEsCGDZ8vw1TIpU4zZLFeKluFyx235OMDriagx/DyxGVy+T2qgbK48o15LNPfAd AWKE2lxrTOGjDELG+l7p3W6rQm3WI87ANugS4pzlKDJyDv8UJ3FcTy9MV96CqP/ra+OduP Yr7SNoyKdltbbk+jfefe/52XHGf4NgZbLsYW4sv5HdJT/bf3BDRS6Ge0/6h3gA99n4VIAu waG6QMNG2OqOV4CtJqRhEZA30gweYJD2YK+ilJNca72LooDWFN9p3si0G5ovdyJjj+cw9X 9Yon8kMLEXHxIoLhMNZboJL3z78No3J/koe9I/cejMbnJpdfNtkDB9WxFLXacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681485744; a=rsa-sha256; cv=none; b=TqAi6cAzFLm4aHipHwstgrxb4QpvJ+P3LaspurNAUb5Fa+4mLnAN6uxgFp1GT+prZDT6Er x5rHGSK+jZgqkazb1htYle2d0a7BPm+A1g7p5m9n7+7VAWkwlZ3Fxid8AJydfOSKVUWPs9 57vkCQGe0fecmKMSiXWpRBxOQxhGQqDGB3AP6B8JCNlQmOnOgJa6knDdSfJsHGUSYgOh4D UzSnyRYKNwVmQepU5bS9k8sQvzskNRtbjxan+3V3GkkFs96fuufkfr15voP1QTq52iHAUZ LIxTBVCAk9uf+l+5+QqTjBH2M7CdZz2mK30U70n43Ukm+wPGYmmmYJXX8ku36Q== 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 4PygDH67dHzVFK; Fri, 14 Apr 2023 15:22:23 +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 33EFMN5m021334; Fri, 14 Apr 2023 15:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EFMNAD021333; Fri, 14 Apr 2023 15:22:23 GMT (envelope-from git) Date: Fri, 14 Apr 2023 15:22:23 GMT Message-Id: <202304141522.33EFMNAD021333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mikhail Pchelin Subject: git: ea26545cc573 - main - net80211: wrong transmit MCS set in HT cap IE 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: misha X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea26545cc573ff7e1f69c7cecaf6773e628b6aac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by misha: URL: https://cgit.FreeBSD.org/src/commit/?id=ea26545cc573ff7e1f69c7cecaf6773e628b6aac commit ea26545cc573ff7e1f69c7cecaf6773e628b6aac Author: Mikhail Pchelin AuthorDate: 2023-04-14 15:16:29 +0000 Commit: Mikhail Pchelin CommitDate: 2023-04-14 15:16:29 +0000 net80211: wrong transmit MCS set in HT cap IE Current code checks whether or not txstreams are equal to rxstreams and if it isn't - sets needed bits in "Transmit MCS Set". But if they are equal it sets whole set to zero, which contradicts the standard, if tx and rx streams are equal 'Tx MCS Set Defined' (table 9-186, IEEE Std 802.11-2020) must be set to one. Reviewed by: bz Approved by: bz Sponsored by: Serenity Cybersecurity, LLC Differential Revision: https://reviews.freebsd.org/D39476 --- sys/net80211/ieee80211_ht.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 2fbb5a10febf..f98316bc5088 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -3209,14 +3209,14 @@ ieee80211_set_mcsset(struct ieee80211com *ic, uint8_t *frm) } } + txparams = 0x1; /* TX MCS set defined */ if (ic->ic_rxstream != ic->ic_txstream) { - txparams = 0x1; /* TX MCS set defined */ txparams |= 0x2; /* TX RX MCS not equal */ txparams |= (ic->ic_txstream - 1) << 2; /* num TX streams */ if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL) txparams |= 0x16; /* TX unequal modulation sup */ - } else - txparams = 0; + } + frm[12] = txparams; }