Commit 6c5b9a32 authored Jun 19, 2023 by Johannes Berg

wifi: nl80211/reg: add no-EHT regulatory flag



This just propagates to the channel flags, like no-HE and
similar other flags before it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230619161906.74ce2983aed8.Ifa343ba89c11760491daad5aee5a81209d5735a7@changeid


Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 4ef2f53e

include/uapi/linux/nl80211.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -4450,6 +4450,7 @@ enum nl80211_sched_scan_match_attr {
		* @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed
		* @NL80211_RRF_NO_HE: HE operation not allowed
		* @NL80211_RRF_NO_320MHZ: 320MHz operation not allowed
		* @NL80211_RRF_NO_EHT: EHT operation not allowed
		*/
		enum nl80211_reg_rule_flags {
		NL80211_RRF_NO_OFDM = 1<<0,
		@@ -4469,6 +4470,7 @@ enum nl80211_reg_rule_flags {
		NL80211_RRF_NO_160MHZ = 1<<16,
		NL80211_RRF_NO_HE = 1<<17,
		NL80211_RRF_NO_320MHZ = 1<<18,
		NL80211_RRF_NO_EHT = 1<<19,
		};

		#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR

net/wireless/reg.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* Copyright 2008-2011 Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
		* Copyright 2013-2014 Intel Mobile Communications GmbH
		* Copyright 2017 Intel Deutschland GmbH
		* Copyright (C) 2018 - 2022 Intel Corporation
		* Copyright (C) 2018 - 2023 Intel Corporation
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		@@ -1587,6 +1587,8 @@ static u32 map_regdom_flags(u32 rd_flags)
		channel_flags \|= IEEE80211_CHAN_NO_HE;
		if (rd_flags & NL80211_RRF_NO_320MHZ)
		channel_flags \|= IEEE80211_CHAN_NO_320MHZ;
		if (rd_flags & NL80211_RRF_NO_EHT)
		channel_flags \|= IEEE80211_CHAN_NO_EHT;
		return channel_flags;
		}