From nobody Tue Apr 29 11:41:41 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 4Zmz1M2txhz5tvBt; Tue, 29 Apr 2025 11:41:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmz1K6q8cz3wh3; Tue, 29 Apr 2025 11:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926902; 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=QCMbjmhFkBkn3/7eilmsvhSzJj2+GL3bCaNZNw+WCAI=; b=cl2py8krmkVt30UAXTFHXWE1IrG9f6AoeDIhFwZw6v5S6d/pWfXDjHDciVWAjeuF2Gykb8 twf3sQz4VnxpleJ4sWjpQLtk2aoH6e8sGI+efUbclbErFit/nF+BnBnLXumNaFpyk3VBql u2X4aAc2WRulFbD1a6p5hsiPL0iGbTztzPDTAs5dxYffua3qEI+Aw9OQfmqoXhhnUILy76 0/x/Je5Jlouks/Jz2phpom4wT5EqRcCTmPj1BR+5MtorWTjIpW525dLboh581FKil77uah qpJU19GO5063P8N6z6xlLfjTc9jRa1HKtJL+nNQ+G97/RM7OYDB8iilhFpLvrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926902; a=rsa-sha256; cv=none; b=Uj8bUFadZMGCbTCuE1KgXN6QqnqFgHBSAy6ZzRAN48Y/JquS8oRO4ZY5JRV/TYCqqrA7F7 lL3RJUpRv+xuee9Aiq7GqHJl9WR5vwN05YJ3wDnz4thKl5vzmMseRq8v3+3lfRqbY1lneQ hYI74W+5tJehQgkFUxffNqCsPuY9AdCAEDQ6A4uYguZ+BlBqKzzZRMuNX0ya8+I9nhbZl1 ewr3Lo5SQiq9YFaayZmtLhS7dC09LOX5xImVHIX5BcCjlXzlLn9xRp1FioBOD0mvL1EcL2 Fw4p/NnqXrlmzV3XDHlp+Th9WtheGoVi81Se0mACwtDvDflFjx7peB3gI6wFcw== 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=1745926902; 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=QCMbjmhFkBkn3/7eilmsvhSzJj2+GL3bCaNZNw+WCAI=; b=EfvhcVE8QInW1eTwyLJi74j4T/GERZUdYz4JyhADIpQq0aLUN85uOweUfCD28KmO5S6CTc XIdp5JHh+1bOhMDbR8bR9oWt10Gp+vnfoILRFa9YQNLxqOqm/4VuUkTpqzEBbZwk+AmtIq PoycLT5Q1BSjSXB9zGemmTnLl3NDLne0b/wz2Ob8c5xdpBtrauqFoHpaDuddS1z0ddx5jN J9TIWTCnkGHR5M5sH1bbBauIOkAxfLFlB91uRGZM77PChrNqXMlnd7vOvpryHpCHxhrS2e 471h8VNSv5W4tGnB+irGYMgvxyLhoRQdXzTpnEj/PrwyAQ5ONoM8oNZcxvbSXg== 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 4Zmz1K5v8Lz3f5; Tue, 29 Apr 2025 11:41:41 +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 53TBffJ1045886; Tue, 29 Apr 2025 11:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBffUx045883; Tue, 29 Apr 2025 11:41:41 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:41 GMT Message-Id: <202504291141.53TBffUx045883@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: 84b198f68f9b - stable/14 - net80211: add IEEE80211_CONF_AMPDU_OFFLOAD for AMPDU[-TX] offload 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 84b198f68f9bd3cc4733cd174500480d7faf9a2e Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=84b198f68f9bd3cc4733cd174500480d7faf9a2e commit 84b198f68f9bd3cc4733cd174500480d7faf9a2e Author: Bjoern A. Zeeb AuthorDate: 2025-04-14 18:19:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:28 +0000 net80211: add IEEE80211_CONF_AMPDU_OFFLOAD for AMPDU[-TX] offload Drivers will set IEEE80211_FEXT_AMPDU_OFFLOAD to indicate to net80211 that the driver or the firmware will handle AMPDU[-TX] entirely on their own and net80211 should not do anything. Following the IEEE80211_CONF_FRAG_OFFLOAD() example add a IEEE80211_CONF_AMPDU_OFFLOAD() check in net80211 to handle the condition. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49829 (cherry picked from commit 585388f9d986151045aaedcde1d29f89e62975c3) --- sys/net80211/ieee80211_output.c | 2 +- sys/net80211/ieee80211_var.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 22bbfe98f4b5..9d6aa750cda1 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -214,7 +214,7 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct mbuf *m, * frames will always have sequence numbers allocated from the NON_QOS * TID. */ - if (do_ampdu) { + if (!IEEE80211_CONF_AMPDU_OFFLOAD(ic) && do_ampdu) { if ((m->m_flags & M_EAPOL) == 0 && (! mcast)) { int tid = WME_AC_TO_TID(M_WME_GETAC(m)); struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[tid]; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 552c45e5ddb2..4dbb940860f9 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -100,6 +100,8 @@ ((ic)->ic_flags_ext & IEEE80211_FEXT_SEQNO_OFFLOAD) #define IEEE80211_CONF_FRAG_OFFLOAD(ic) \ ((ic)->ic_flags_ext & IEEE80211_FEXT_FRAG_OFFLOAD) +#define IEEE80211_CONF_AMPDU_OFFLOAD(ic) \ + ((ic)->ic_flags_ext & IEEE80211_FEXT_AMPDU_OFFLOAD) /* * 802.11 control state is split into a common portion that maps @@ -697,13 +699,14 @@ MALLOC_DECLARE(M_80211_VAP); #define IEEE80211_FEXT_VHT 0x00400000 /* CONF: VHT support */ #define IEEE80211_FEXT_QUIET_IE 0x00800000 /* STATUS: quiet IE in a beacon has been added */ #define IEEE80211_FEXT_UAPSD 0x01000000 /* CONF: enable U-APSD */ +#define IEEE80211_FEXT_AMPDU_OFFLOAD 0x02000000 /* CONF: driver/fw handles AMPDU[-TX] itself */ #define IEEE80211_FEXT_BITS \ "\20\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \ "\0114ADDR\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\16STATEWAIT\17REINIT" \ "\20BPF\21WDSLEGACY\22PROBECHAN\23UNIQMAC\24SCAN_OFFLOAD\25SEQNO_OFFLOAD" \ "\26FRAG_OFFLOAD\27VHT" \ - "\30QUIET_IE\31UAPSD" + "\30QUIET_IE\31UAPSD\32AMPDU_OFFLOAD" /* ic_flags_ht/iv_flags_ht */ #define IEEE80211_FHT_NONHT_PR 0x00000001 /* STATUS: non-HT sta present */