From nobody Tue Apr 22 20:03:53 2025 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 4ZhtV22sT9z5t7n8; Tue, 22 Apr 2025 20:03:54 +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 4ZhtV20zMkz3VGq; Tue, 22 Apr 2025 20:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745352234; 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=fOJCrn3ZTIc/85XTk8QqDTVuVFA4/X75pqlgTMFsF3k=; b=hCOOfG8M+d32D+X6S4SHi5NcS0y/XccnAaThc+RMp+JdOhqZAotuL2V9nB/Qthwi5WfVcF hxag+t3Af6F2bdoMvtC4s0MNZ2rA839qoIXmIXZKKW3/LL3UP2PSnxgMb3VDITLMCzbiOf MBBYhzDyetXculYFdSVy8iBV3zp1QRfCuVgPip5GVdX95bY+aXAuBCAoAJU97aELtNgqU8 uAOXFX3rYVL02Ip0BaHJVk7Cgglrrm/fe51OPFiJb9AyTrQ3VGhUBWsowaBaAdND8Rp3xD K4jC3jQ0hXS+UgnyM4mRm8LMVJ4SR20lbQ6nwdItu6tmiNoTMB+h5zdW6oOekQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745352234; a=rsa-sha256; cv=none; b=lDmpGcXmZFJhJA+81u8t3LAAALAvqBAsQUGdcyBIb6csN63/52k+jPNeS2G3duE0urrVOE 5aJg2l0oEqojSlUXIiRXDc/tG0CB43YwPxZmo4/tX/u8rHK7Sv45LFGeIEpR0GbBOOqG5Z gsK4NY3osNQLGxPtlhkTc1sHGoGqUI2+/mbtLj8Cz3fuYIvK+k9KPHqn94ZTUYxrdL8y5S 6/532GR1xYZGE2cn5wT5SBZ/y1yAXprHJakpwEsDBXQs35XhX1QEJZaCLrnQ30V9ppHOpu S7JVRmOVgvel7So4L0A6bO8FLrDeZQUtUofpXQ7ZbJ5L6Yzu6FAz0SqeejRdZg== 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=1745352234; 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=fOJCrn3ZTIc/85XTk8QqDTVuVFA4/X75pqlgTMFsF3k=; b=ctfgK4yJPWl37ih8bHJO8JXS4W5QzqJgmaSFjerGvYr2s3jCq0u/zH7epF2XVARWzPsLFX 236w3GtbvIlwyc1XLPiQ/DmU4mAsJa4jMiWXAr3OErDtQamgYzhU38HXKBNNU3kSm/DLLD T8tFg3HZKXRfKPRXB29JoBeo91hnUEo4iEQBvkbp8Cqh2DPx78+4o9IGObBveQhJFR8Q/A Lf75JOF2pb01UcjbH857n+iL9NqsJuCIULpOysdBVyfvPyjiuRxhjtAK+Rq7Ffea/VOS62 T5MjqxVgncxymS8dWrYZdiphyoCZ5MUiO3FXkGh4xIBT8vmhHBPunsU33pquLQ== 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 4ZhtV20DPgzZTZ; Tue, 22 Apr 2025 20:03:54 +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 53MK3rJO098965; Tue, 22 Apr 2025 20:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MK3rHP098962; Tue, 22 Apr 2025 20:03:53 GMT (envelope-from git) Date: Tue, 22 Apr 2025 20:03:53 GMT Message-Id: <202504222003.53MK3rHP098962@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: 585388f9d986 - main - net80211: add IEEE80211_CONF_AMPDU_OFFLOAD for AMPDU[-TX] offload 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 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: 585388f9d986151045aaedcde1d29f89e62975c3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=585388f9d986151045aaedcde1d29f89e62975c3 commit 585388f9d986151045aaedcde1d29f89e62975c3 Author: Bjoern A. Zeeb AuthorDate: 2025-04-14 18:19:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-22 20:03:31 +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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49829 --- 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 f2f89d2d9d7c..e3cd73cd22d6 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 6c52fd22f29e..e011d2dd32ed 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 */