From nobody Tue Sep 9 01:52:40 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 4cLRfJ5dnpz67PX1; Tue, 09 Sep 2025 01:52:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cLRfJ33Kfz3mBQ; Tue, 09 Sep 2025 01:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757382760; 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=1RUM5xLv9ej2R0IBHQGR7FFQ/Qtl2PUqXkrjTxo+KXs=; b=Lipw0UOMSS/PEDf55rck10kpviysSv6UPbAfw/jwbiUC/4sDB218buieKn7jAo39Q45zfL OgwpP5clx0HyI5NvQi8AscpNfbN72vCNmFXI1VQ+PLemC2mhqsoGKc7LZS4NKw5J3ov8ZO TpJBqCa38F8hQdKFctQoqPw+dgOEtpgm4vdet2yTMw1zJj3Ip4Veaznd3rv4tpgnwYQ4XT JuLZCzIApQFW0JlHjtpWuMyTFGT6RB91kNiCSBOB6r1EHu8WWvajIo/QkvevBL09/W4a+S rA6f48aZ9788vGt4TMu0yBuljuGFSSddPZUnQRfdL7DUzvPcWg0+XQSWbsOXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757382760; 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=1RUM5xLv9ej2R0IBHQGR7FFQ/Qtl2PUqXkrjTxo+KXs=; b=W9sGhZO/TYiLwnpR2ERvDDfpw06seiEtoQDsP3fAxXkpmDh6PPJ/krlZEoH+14wW+B4sqh sZTIN/8VV81eyUBsJp8U22na+ESbMgXOnPM544oiuebZ0UfamRm7NQaa62QxaVT0lRutlD vu07YU5XpMzNaivBclXZw0LUxy/hp4/oNemxsKS7rJtFl0VWb5FApGKbbfvEyMWZoqclTE IdOWh5mQq3XwgunCSSC0+UB0Ayn7fUPebikkX7OzRNJgPBFfoRe4F9jZCvHnYtVB0FaWht 0g2YMA6pNnzcLK1K8DMe65llfNeGq/P1CCGKcgEsbWxJXMk5vLnV+xXwyAsoGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757382760; a=rsa-sha256; cv=none; b=o44dJU8EZYsEaAIAZO8GLu3Vrh7oGjmVubtnh67VJ4m7Y0ueBNd8xd837lcOPx7brUB4R4 0sGp/0uKrzNFdsf5fMRifLjaBUd5HWPXtv6hXtXGq3rt+JvjVoi972y97/PRkV6A0yC5LA +t58wkQP4y9pxx5p9QJLC+1NBnK1VfhCB5Sn1/fV0JyW+YTzWoMeTS8fpDttTOFchfeKbI Ibvqdrc7IfsBuRi7CMkZhHowE2xehdW8P1veENlbgR/ue62bQthOvTiiFC3QkwvPhJl8zL jaOUc8PZa+l63toBLMBOEeeXIkU3dBIymIEEhOI/xvgqIVo3QqMMR0lwlDUVuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cLRfJ2d63z1dp; Tue, 09 Sep 2025 01:52:40 +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 5891qeN1058764; Tue, 9 Sep 2025 01:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5891qequ058761; Tue, 9 Sep 2025 01:52:40 GMT (envelope-from git) Date: Tue, 9 Sep 2025 01:52:40 GMT Message-Id: <202509090152.5891qequ058761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 9bfb1405332c - main - net80211: add support for drivers to disable sending NULL data frames 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bfb1405332c6c847dd29e4db4dd3afb56662021 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=9bfb1405332c6c847dd29e4db4dd3afb56662021 commit 9bfb1405332c6c847dd29e4db4dd3afb56662021 Author: Adrian Chadd AuthorDate: 2025-08-27 17:03:22 +0000 Commit: Adrian Chadd CommitDate: 2025-09-09 01:48:10 +0000 net80211: add support for drivers to disable sending NULL data frames net80211 has various places where null data / null qos data frames are sent. However plenty of NICs shouldn't be sending them from net80211 and it may even upset their 802.11n window / sequence number tracking. So add support here. Differential Revision: https://reviews.freebsd.org/D52297 Reviewed by: bz --- sys/net80211/ieee80211_output.c | 6 ++++++ sys/net80211/ieee80211_var.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 57fe687adffe..116fc76a9ce1 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1082,6 +1082,12 @@ ieee80211_send_nulldata(struct ieee80211_node *ni) uint8_t *frm; int ret; + /* Don't send NULL frames if we've been configured not to do so. */ + if ((ic->ic_flags_ext & IEEE80211_FEXT_NO_NULLDATA) != 0) { + ieee80211_node_decref(ni); + return (0); + } + if (vap->iv_state == IEEE80211_S_CAC) { IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT | IEEE80211_MSG_DOTH, ni, "block %s frame in CAC state", "null data"); diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index a0293f814899..b9bc2357428d 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -700,13 +700,14 @@ MALLOC_DECLARE(M_80211_VAP); #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_NO_NULLDATA 0x04000000 /* CONF: don't originate NULL data frames from net80211 */ #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\32AMPDU_OFFLOAD" + "\30QUIET_IE\31UAPSD\32AMPDU_OFFLOAD\33NO_NULLDATA" /* ic_flags_ht/iv_flags_ht */ #define IEEE80211_FHT_NONHT_PR 0x00000001 /* STATUS: non-HT sta present */