D52297.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52297.diff
View Options

	diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
	--- a/sys/net80211/ieee80211_output.c
	+++ b/sys/net80211/ieee80211_output.c
	@@ -1082,6 +1082,12 @@
	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
	--- a/sys/net80211/ieee80211_var.h
	+++ b/sys/net80211/ieee80211_var.h
	@@ -700,13 +700,14 @@
	#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 */