From nobody Fri Jun 5 12:10:11 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 4gX0cg50zjz6gyGK for ; Fri, 05 Jun 2026 12:10:11 +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 4gX0cg0pYwz44TY for ; Fri, 05 Jun 2026 12:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780661411; 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=3AqLmKEJl0fak1N01yRIPyMZVyLg1HedB4uZbrjFSh0=; b=RyUKV6c7QlwVeaaYt68sI3pppV9QYebv6USoIqE6Bj0F1h6ephOIlLJulk9tkmrIrNkor8 QxctLyyeip/IuQTZCXJyMyOMGMuJeDpBs7I40Y5V+BADCzr2BgUPUCqDfJ40CrCP3SWxwt 46u5uiLuKe6/F8uL/3Drzy19HYbLRTd0cmW0HovFmaPxFrVSPHTvvyo3QOxqf6UVJ534+d BlEYCWP45G8U0iYKz2ttZyvsP+W8xlh3j7yfxUF4Ym9iwhxqnLkcLeQ+OWHed43+rixdtt zj81ALvlK+lJsd4gTSKAeGvoW4MfyAZSmWbWOws0v+j9HkMqN+9pFBoisZIXiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780661411; a=rsa-sha256; cv=none; b=ii0QuWBfBXNqmzhifJVb7Guf5mzrk3FZNjml/LNv6l6sIUy0afLQr6AOlpyCn4IJAepQX5 +xPjqr8S84IhL0m1PHJBOFCw7tx68dykhGZynt+vQONzVuJP0EQIB5OkfkGxNuE2QB5Du0 S8IvPjTqKOfMl1Sr/ry4msw+6TFrYTlXiR9Z//+L/GAWVRp/Dn+5eZcMF3xzU0Z5cACCjA 8L25Y0cGmQq5f0eqk46iQwW0gqAFKOcG0vNBBpNBERhtKuaG7pRQCzXFPFX9T0m2qqp9fQ lqOx8tAp+10UVnYILCmA2bQABeGZRr8l1Cx9syTITXb/ZPAhRve9Ad6+GeGf+w== 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=1780661411; 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=3AqLmKEJl0fak1N01yRIPyMZVyLg1HedB4uZbrjFSh0=; b=Gnxy8z7Gq3r5A5ohD7JtnwVk+nYG2Gg3quuW0MbK89naK4YQ5mY+ddnlmgADv99s7P4Rv4 h/61Hsvw5wS7SThqABx0jtV/f1hZxHhASQ7nb0T4M82ZPpH0vn8mxXAxhbjWZLYtdD3Llc p9+L/4vwGUq/laaqjtpMXv59QLFicy/b/SbUVaVptC8CPQRvtYzqJwgCmIFbfD6DUm3oeW XVXr9NlJr/J9Ik8+kacgC9G+8dMYz4IjSpoMnssM9Xxqkyo/dGPz5hPjQbHsMykjsgy6Ef +rkwFqR9VD72beTcXMhrMZNKzOl1lz3T+pG5rgQQh4fxYtAuKySM3xTMQ2cYZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gX0cg0MYqzBp7 for ; Fri, 05 Jun 2026 12:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 12:10:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: cda79e505e21 - main - 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/main X-Git-Reftype: branch X-Git-Commit: cda79e505e2120fe3b4c4f16cb18d92bf2e01e4e Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 12:10:11 +0000 Message-Id: <6a22bca3.24c61.76fa22f9@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cda79e505e2120fe3b4c4f16cb18d92bf2e01e4e commit cda79e505e2120fe3b4c4f16cb18d92bf2e01e4e Author: Bjoern A. Zeeb AuthorDate: 2026-04-27 00:55:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-05 12:09:23 +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 MFC after: 3 days --- 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 11c37f9529de..c6dcae2bffff 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5849,6 +5849,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