From nobody Mon May 25 01:33:08 2026 X-Original-To: dev-commits-src-main@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 4gNz0h6VVxz6fdjV for ; Mon, 25 May 2026 01:33:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gNz0h5F3cz3SCk for ; Mon, 25 May 2026 01:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779672788; 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=TWky71U18rnuDeGfAQ8dvqNHgn0DaL2i1CBFNweFimg=; b=QM1gOauo112O/WOOq+7+kc+5IzVkruDuF+3F7WjMKntfR7F8xGE/wJl1eFgKGPmDg3osVU ttZ3TnaZu6P1DpEGXsDXh/Um8JoTfU4e0tBAAPR1U3WeEvI9/Ud24u62Xf7Bmy2Xq6NHt6 31XQ2u1YYJnoaZmwPYYLMuy4GaD7mcSyUv4hj4nsas0itksuDrICfDgbUkP/b0uBLT9pIA TGBuWsw9vuDe8t4vA1W3yhJAI2Yu+FxxR1OndKkj2Gk5e1Kp4f7bC3CFtQJO+PXuyd1udG ixoWq6Rj6SEDHwmdkXxX4Zphw5aWgb5vHsubCUYXKKukBXIiKphMWIZ5HXRMVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779672788; a=rsa-sha256; cv=none; b=NS0hVzTpvqZrfTmk7Li9qz46uazCAyNFlLWnO6NlM5gb5z/dASIJS0WLzmcUCKXJP2bFoe MWo+18Jmqr9AVIanN0hhpgr6S4yu0xY56+XIYZ7cmzyO7zAwMcbbusmFzgt6NVQbJD1qEh 1TKLm8H9JKRVmlmBuBKGeK1gVN5YClOzX2Ti+rIf/TScWN5GJ4rqUiZBJHDfqshEbJv+Zg uGbFiXR11fNF2//4vxQ09SVq6xUn7B/keosK1Y8E8s9walfe9KNXmoUMQ3ehyGas/g/rjC Crwu2Yq9GnQd29seaYwDpW+y3IQgtxvNrLkQ9TZQtmv1kIJnoU3BtqopzF5jpQ== 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=1779672788; 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=TWky71U18rnuDeGfAQ8dvqNHgn0DaL2i1CBFNweFimg=; b=tl9a4FsBf2AtCM41GTGnZB/FDTx4OZw26p1xfzT2G1tYnUrfmr4GRYqF/fnab+05dMSiB/ vrsVxKo8gfVjE2xiE3ghaokbfnZJDIfRXAUNOKgMe12DorQTJk/FWLE/KuzRhSHitb0ZFN WfdecmZQZK2iAvDMpDcoR1MTco6+XIukFmmuOUlMvTug5KKHnZDI1ZRyu5YbjWr7t+9pxI YbWAUz5qywqOFOUw+vAxpkMzzUt4WZGe5Fnfq2M9+ejmPwsip3jbsczoBO5oLtlbuyuivV ziEAXP76Cp1wxA3N/hFK/trpywiJ13YqUSRXYNy2H+Sb0duw3dX/wlhHUmTimg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gNz0h4lvKz43q for ; Mon, 25 May 2026 01:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43f82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 25 May 2026 01:33:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: e3b4dbb80577 - main - net80211: create ieee80211_ht_check_bar_exceed_retry_count() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e3b4dbb80577fcecb74566d2c1a219dac146f541 Auto-Submitted: auto-generated Date: Mon, 25 May 2026 01:33:08 +0000 Message-Id: <6a13a6d4.43f82.20743414@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b4dbb80577fcecb74566d2c1a219dac146f541 commit e3b4dbb80577fcecb74566d2c1a219dac146f541 Author: Adrian Chadd AuthorDate: 2026-05-17 18:40:03 +0000 Commit: Adrian Chadd CommitDate: 2026-05-25 01:32:04 +0000 net80211: create ieee80211_ht_check_bar_exceed_retry_count() Create a function to check if the BAR retry limit has been reached. Use this in if_ath_tx instead of a hard-coded value. I've been meaning to do this for a long time. Differential Revision: https://reviews.freebsd.org/D57055 --- sys/dev/ath/if_ath_tx.c | 3 ++- sys/net80211/ieee80211_ht.c | 20 +++++++++++++++++++- sys/net80211/ieee80211_ht.h | 2 ++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c index 9ac591c14943..d37210723680 100644 --- a/sys/dev/ath/if_ath_tx.c +++ b/sys/dev/ath/if_ath_tx.c @@ -6225,7 +6225,8 @@ ath_bar_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, * Also, don't call it if bar_tx/bar_wait are 0; something * has beaten us to the punch? (XXX figure out what?) */ - if (status == 0 || attempts == 50) { + if (status == 0 || + ieee80211_ht_check_bar_exceed_retry_count(ni, attempts)) { ATH_TX_LOCK(sc); if (atid->bar_tx == 0 || atid->bar_wait == 0) DPRINTF(sc, ATH_DEBUG_SW_TX_BAR, diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 9b2b0df33785..8ebfbbae6377 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -2899,7 +2899,7 @@ bar_timeout(void *arg) if ((tap->txa_flags & IEEE80211_AGGR_BARPEND) == 0) return; /* XXX ? */ - if (tap->txa_attempts >= ieee80211_bar_maxtries) { + if (ieee80211_ht_check_bar_exceed_retry_count(ni, tap->txa_attempts)) { struct ieee80211com *ic = ni->ni_ic; ni->ni_vap->iv_stats.is_ampdu_bar_tx_fail++; @@ -3845,3 +3845,21 @@ ieee80211_ht_check_tx_ht40(const struct ieee80211_node *ni) IEEE80211_IS_CHAN_HT40(ni->ni_chan) && (ni->ni_chw == NET80211_STA_RX_BW_40)); } + +/** + * @brief Return whether the given BAR retry count exceeds the configured count + * + * @param ni ieee80211_node to check against + * @param count BAR retry count + * @returns true if the count has exceeded the configured count, false if not + */ +bool +ieee80211_ht_check_bar_exceed_retry_count(const struct ieee80211_node *ni __unused, + int count) +{ + /* + * Note: ni isn't used here because the BAR limit is currently + * global. It's here for future work. + */ + return (count >= ieee80211_bar_maxtries); +} diff --git a/sys/net80211/ieee80211_ht.h b/sys/net80211/ieee80211_ht.h index c31bb8700289..505b39628dcf 100644 --- a/sys/net80211/ieee80211_ht.h +++ b/sys/net80211/ieee80211_ht.h @@ -247,5 +247,7 @@ bool ieee80211_ht_check_tx_shortgi_20(const struct ieee80211_node *ni); bool ieee80211_ht_check_tx_shortgi_40(const struct ieee80211_node *ni); bool ieee80211_ht_check_tx_ht40(const struct ieee80211_node *ni); bool ieee80211_ht_check_tx_ht(const struct ieee80211_node *ht); +bool ieee80211_ht_check_bar_exceed_retry_count(const struct ieee80211_node *, + int); #endif /* _NET80211_IEEE80211_HT_H_ */