From nobody Wed Apr 22 21:07:55 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 4g1BdS3L9hz6bKZD for ; Wed, 22 Apr 2026 21:07:56 +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 4g1BdS05tTz3k6P for ; Wed, 22 Apr 2026 21:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2BNASeidbJQDzSIkiIrisEYHuE8yHYebD48t5uOVmgk=; b=ul28Ozkkv1pqi1xmXtEgQbIk4rrsj0/idMCzTXBOIocB4dfNuzDnWQVthMSkaY+ui8qmWf o1PexLcTAsz3xkvY+aubqfvOgXOp5Q1UXxOkJUHn7LjZvFWYqapyYjMuNfPS40FcrcDJQM Ine4hOR+h2+RoDGf5BJL2i64Lu76tJXtF7RkZuoHGQyMWhEoVEV51Kg+pn61m6mlzpaHDT m9JMHuFsSrgTRdtqnUJPcHrDMuI4R9PkFiOqQCaZSYTIUsQRMtdRDbnTUvuzbCGc8EJXzV Xm/ShZugKTx/4T4UGH4nD1AIi17uwBke+hd6MZER4ybpu8HvT4vRg7Xq/liOrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892076; a=rsa-sha256; cv=none; b=GIg2t+GOlxixEgSbNofTDND0ffaWhoGcdrZVnc7Axy+fRMnGpQkE6Zh0saG1RMOQtMnMiF p3/Va4PbTLMdTAoiRPFQpdBTzvXZMZnF5Bj4kokivOxmH0rBV88oM3fAcheTyJMlDmbZIU ciYz9Jv4ULSgb6a9xmPQCqQRygs7m7C9IEKSW4X+1lDb118N8gp3HiwMZk2uBZtz/S9eus 7SrXjngTDauBNn2jXqATyx/WMaeQ5CIF5tCDBdeBHgX1CNaLmDkXcsfP97cAmD7AvRbDcR EZAo/a1h8/EAVilGzZnBXCTeyeXvIyFBuLpomfgLqiYWBbhtdaop3FJ12SLESw== 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=1776892076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2BNASeidbJQDzSIkiIrisEYHuE8yHYebD48t5uOVmgk=; b=DvnxC0Q81U4Ob9OkFWExk8DMNddaVBdug/8WXsoyyurumD1STcw+0TogCJT/0Y+tokX/GG wsGGQ7siYTjJlPChESuklMpwNVd6GZTwWHwYRpmqvNnvp9F/AVqjSDJ6D4sB2bJPetKgU2 lWf8TVeJpohbi+Bt/znGj0ZRYIHxOBt7rQc2oYYIXOdHL9vL/A4hRACxE87gw5E5H8KAgO tM3NinFmx+bge7+O7+1dRQzJ5s9xWUwQOo2PqG2bYxQi+1m4yyhNmlriRGsKFK+b45/IXp 8Gpg4c7vEFDmT0rBZSAhSfgZiIKKhVy2gZOZKqksSw6420BNN6yCczIRNiEWCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1BdR6QkBznZ5 for ; Wed, 22 Apr 2026 21:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27669 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:07:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Adrian Chadd From: Bjoern A. Zeeb Subject: git: b55f25d49be2 - stable/15 - net80211: add support for drivers to disable sending NULL data frames 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/15 X-Git-Reftype: branch X-Git-Commit: b55f25d49be2197353e00bd2d299b0556df91af1 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:07:55 +0000 Message-Id: <69e938ab.27669.748e896a@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b55f25d49be2197353e00bd2d299b0556df91af1 commit b55f25d49be2197353e00bd2d299b0556df91af1 Author: Adrian Chadd AuthorDate: 2025-08-27 17:03:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:56:50 +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 (cherry picked from commit 9bfb1405332c6c847dd29e4db4dd3afb56662021) --- 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 c09bb90d7ad3..7b45261f59b1 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 */