From nobody Sat Mar 1 23:33:12 2025 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 4Z51bX6HGyz59N7w; Sat, 01 Mar 2025 23:33:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z51bX5P7zz3mTl; Sat, 01 Mar 2025 23:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740871992; 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=3WNoBHyPYKOkCkyDhGninHUEk2zM+QZ2EvNL94phqq4=; b=C/UyF5LsQZx2rTLTfNaI2aEHwMSakULWL7m1NpO2g41OO4z++9WJxqbHB5h2nZ2Z2w3XlJ bgA3V3dYfFlA9BPQGTI25sZkHdg1MfWOf3CUUi7Yd0i5Sg9mNlhsRwvYY1EObNsRUoBAtI sv1Nl1tWvxB8cRYdTKB4OK3EsFZoy7pLLoX5F5iGswf4wxvGmvpNY43JPFCKwVEhh2PU43 eBbfa1wnMQG/RkablV4QLyNuToSC8uYR3jMfC7SKLDK7ou42G5+98K+ivBH+AKd2wSzn8y UYAUK1PTX7SgH1JI25P3u5fvEPeS36WRMsd8SXNmOFXUSAj8YxYSIZ2YOTw6iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740871992; a=rsa-sha256; cv=none; b=uWPwzJ9mx1hsneQ5taxR3OqkEIgCLTaYry+Dbqts5B7lXpFKX3f+jHJkDrDbUflR0T7fTu cjUB4PUI2N5RUOotFrYwz9gpfy/cpAOeqRGE3wsjZrHOgmiG1wsyOMpvJzyJnmBS8rEjO4 iN8Me7vY54iytFKY/fXymtZo4iSUFzGIwd0UdJ3s0o/0U01aryyLTQYkOFMij3olEAbNoL LG+97o1nj2XAgf3FCFTfC1txCe3j3GYwqL5cUiy2flXd+Gxbx6LBdUx50ioyYZtzCcJtnO 6vQvFjRWVI9GjHlv0welh3QioIqeyK2EOJhllxKpYwgUCNfQy1lGEVW3wLKGpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740871992; 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=3WNoBHyPYKOkCkyDhGninHUEk2zM+QZ2EvNL94phqq4=; b=aUU+xeCdm2O3AGT/X1RXEO1+OKlae+anFk6+4ar8wj4ZB2HiRf7Fy65K6R3LAVCQ08BdMY o6QX/H0zirIG/9tLijhycd+vroAIwBb2W4Ljq5h3EhhnIj7CSQqnZIfmHSA+dICSDzFwQx UzUsFa4A9wOsRaskMxBE3ry64bEzlISAJLRbGg/+7bHjw3/hr4kY3GeAS5b3RjLx7rfrH6 vJ/BLUMZ2aLwwZLBE+0mXTv8V9xgLVswooOc/YrAQp1I9I0Aj255T1KGO57YbVjHloAdKS /OSCZt/XFKbyi+MYcfzWy62jD+ipgIXEyOklAroi1Y/GlbSpX8lBXbiHRySY0Q== 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 4Z51bX4mnYzcyK; Sat, 01 Mar 2025 23:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 521NXCgD052816; Sat, 1 Mar 2025 23:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 521NXC2W052813; Sat, 1 Mar 2025 23:33:12 GMT (envelope-from git) Date: Sat, 1 Mar 2025 23:33:12 GMT Message-Id: <202503012333.521NXC2W052813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 50ec1e7af002 - main - ath: fix 20MHz HT short-gi logic. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50ec1e7af002d710eaefa5dd5f581efc20159122 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=50ec1e7af002d710eaefa5dd5f581efc20159122 commit 50ec1e7af002d710eaefa5dd5f581efc20159122 Author: Adrian Chadd AuthorDate: 2025-03-01 22:35:26 +0000 Commit: Adrian Chadd CommitDate: 2025-03-01 23:32:04 +0000 ath: fix 20MHz HT short-gi logic. This was broken in an earlier commit (ca389486a9599768e0ba69dca13c208020623083). PR: kern/285096 Differential Revision: https://reviews.freebsd.org/D49196 Fixes: ca389486a9599768e0ba69dca13c208020623083 Reviewed by: bz --- sys/dev/ath/if_ath_tx_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c index ac61c7b4cf54..e7ee029fecf0 100644 --- a/sys/dev/ath/if_ath_tx_ht.c +++ b/sys/dev/ath/if_ath_tx_ht.c @@ -301,7 +301,7 @@ ath_tx_rate_fill_rcflags(struct ath_softc *sc, struct ath_buf *bf) rc[i].flags |= ATH_RC_SGI_FLAG; } - if (ni->ni_chw == IEEE80211_STA_RX_BW_40 && + if (ni->ni_chw == IEEE80211_STA_RX_BW_20 && ieee80211_ht_check_tx_shortgi_20(ni) && (bf->bf_flags & ATH_BUF_TOA_PROBE) == 0) { rc[i].flags |= ATH_RC_SGI_FLAG;