From nobody Mon Jun 29 06:34:17 2026 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 4gpc225sd9z6k5BM for ; Mon, 29 Jun 2026 06:34:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpc216zXdz4GTD for ; Mon, 29 Jun 2026 06:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782714858; 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=TBDUH/COIsCvMaSjQZYqxgUhfxq9Optx6Ea4H5EJblc=; b=i8+g3NrAksMrW7GHNWUGWpEkdwh2HXGyy75e8Py9TvFiA4855nlCQZ+1P1/g+H3R5yLAYb WNPMrBvOZyfM0Uh30lHSMP3CV8ziI0Swr3noRNB3qkIoZ2P01mOHYxefQVlvq8Ci2wF1gM /wKKXbVAFmyQGg8HNZDsS2ZYmkzkt/1t3wO+lrTxakGTXzEqsuVD/hUuTYef/gm9cd5xwm dRIuL/HDSAeymKs9rJu3OWLmam0WQoQDTdocTOcgpTs+mSjPwH/gg54AMWGJwG20ta09/R ACkk3NeY7Feqn11s/fOnmL4DAPXdvXFujb6RdskQpejRbWBSbz2NF1ypWoUvFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782714858; a=rsa-sha256; cv=none; b=cH9TBZSVDAandf8ZNDFwIphtPPZyGla9NmMYwOW3u6vrfbXf5zaj2m7ZzBksicSMjbBrDv IOM5awyCe/R5VU9VR5gtKzNVH18zaphDeD6BffPW0w3FuZ3ui/DABOIa2ct1sc6bhDYwUr WyKRkRX0PunP/pZNEBBaZ0lk/AhBou0V/lnrOK4X3gYKgHsjgLjZYfLOK3zSmUzr9LA1RO PVODb5W/xnF3R/dbIJWSS2EknxlJCenunmHRrThYKiMWDpT9L9zuw0yf6v583OVWk1nilb CzbIWg+zMhTEOzSey2K8BIOGa+tgxNRahi+7LUjNC5Da5F6n2nBHHJlgsoo5Fw== 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=1782714858; 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=TBDUH/COIsCvMaSjQZYqxgUhfxq9Optx6Ea4H5EJblc=; b=SGk5SeApFrynFFoLeJ1saUlBHg/GFyoaRjkNbdQRl/sdpYVRVRGhR+fFwYwDTAinyEc60v tSeye6BPNOpKeSWVFUvuGa2Umbtx2h7D1zdxpaoZZjKNnjG6Tbd51haCZvGG71788TywvA uq4wvxhGEmw2kuxw+MwVo/B3TgIQ3OXt3os+FwV33b57/ZSAKHa6jbcZBl9wop82lrfSjh fDlA8+0+i9yGsoByfF2mfT+2hxpcXC3a2wc6CjaU44Mu3amQ57bvYlPbc+oJZPAuPH2MMd YJtvQvCPbX6vhwpUeunsLY/GcsT06tt/uIYOlOKehI8+9JPSMbngEHXhiFrjpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpc215tn5zmgv for ; Mon, 29 Jun 2026 06:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44f74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 06:34:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 482d4b6e725f - stable/15 - LinuxKPI: 802.11: set flag if frame should be part of an A-MPDU 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 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 482d4b6e725f081c836ffa268e906bd161f66993 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 06:34:17 +0000 Message-Id: <6a4211e9.44f74.79d5b8b8@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=482d4b6e725f081c836ffa268e906bd161f66993 commit 482d4b6e725f081c836ffa268e906bd161f66993 Author: Bjoern A. Zeeb AuthorDate: 2026-04-27 00:55:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-29 03:52:14 +0000 LinuxKPI: 802.11: set flag if frame should be part of an A-MPDU In the output path where we are sending a frame to the driver mark it if it should be part of an A-MPDU based on its tid, type, and whether net80211 thinks that we are in the right state for this. Sponsored by: The FreeBSD Foundation (cherry picked from commit cda79e505e2120fe3b4c4f16cb18d92bf2e01e4e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3039d18d7a42..81823e225627 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5843,6 +5843,18 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) info->flags |= IEEE80211_TX_CTL_USE_MINRATE; /* mt76 */ } info->control.vif = vif; + + if (tid != IEEE80211_NONQOS_TID) { + struct ieee80211_tx_ampdu *tap; + + tap = &ni->ni_tx_ampdu[tid]; + if (ieee80211_is_data_qos(hdr->frame_control) && + !ieee80211_is_qos_nullfunc(hdr->frame_control) && + !is_multicast_ether_addr(hdr->addr1) && + IEEE80211_AMPDU_RUNNING(tap)) + info->flags |= IEEE80211_TX_CTL_AMPDU; + } + /* XXX-BZ info->control.rates */ #ifdef __notyet__ #ifdef LKPI_80211_HT