diff options
author | Arik Nemtsov <arik@wizery.com> | 2014-11-27 02:44:55 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-28 08:33:41 -0500 |
commit | ad932f046fbe9839479350e7b88082a7d1dea498 (patch) | |
tree | bde027962f8f061558db060102872d7de0435adf /include/net/regulatory.h | |
parent | 336004e29115e47253f7e7d007df9e1f9e73dcdd (diff) |
cfg80211: leave invalid channels on regdomain change
When the regulatory settings change, some channels might become invalid.
Disconnect interfaces acting on these channels, after giving userspace
code a grace period to leave them.
This mode is currently opt-in, and not all interface operating modes are
supported for regulatory-enforcement checks. A wiphy that wishes to use
the new enforcement code must specify an appropriate regulatory flag,
and all its supported interface modes must be supported by the checking
code.
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: Luis R. Rodriguez <mcgrof@suse.com>
[fix some indentation, typos]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/regulatory.h')
-rw-r--r-- | include/net/regulatory.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index dad7ab20a8cb..b776d72d84be 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h | |||
@@ -136,6 +136,17 @@ struct regulatory_request { | |||
136 | * otherwise initiating radiation is not allowed. This will enable the | 136 | * otherwise initiating radiation is not allowed. This will enable the |
137 | * relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration | 137 | * relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration |
138 | * option | 138 | * option |
139 | * @REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make sure | ||
140 | * all interfaces on this wiphy reside on allowed channels. If this flag | ||
141 | * is not set, upon a regdomain change, the interfaces are given a grace | ||
142 | * period (currently 60 seconds) to disconnect or move to an allowed | ||
143 | * channel. Interfaces on forbidden channels are forcibly disconnected. | ||
144 | * Currently these types of interfaces are supported for enforcement: | ||
145 | * NL80211_IFTYPE_ADHOC, NL80211_IFTYPE_STATION, NL80211_IFTYPE_AP, | ||
146 | * NL80211_IFTYPE_AP_VLAN, NL80211_IFTYPE_MONITOR, | ||
147 | * NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO, | ||
148 | * NL80211_IFTYPE_P2P_DEVICE. The flag will be set by default if a device | ||
149 | * includes any modes unsupported for enforcement checking. | ||
139 | */ | 150 | */ |
140 | enum ieee80211_regulatory_flags { | 151 | enum ieee80211_regulatory_flags { |
141 | REGULATORY_CUSTOM_REG = BIT(0), | 152 | REGULATORY_CUSTOM_REG = BIT(0), |
@@ -144,6 +155,7 @@ enum ieee80211_regulatory_flags { | |||
144 | REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(3), | 155 | REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(3), |
145 | REGULATORY_COUNTRY_IE_IGNORE = BIT(4), | 156 | REGULATORY_COUNTRY_IE_IGNORE = BIT(4), |
146 | REGULATORY_ENABLE_RELAX_NO_IR = BIT(5), | 157 | REGULATORY_ENABLE_RELAX_NO_IR = BIT(5), |
158 | REGULATORY_IGNORE_STALE_KICKOFF = BIT(6), | ||
147 | }; | 159 | }; |
148 | 160 | ||
149 | struct ieee80211_freq_range { | 161 | struct ieee80211_freq_range { |