aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorIlan Peer <ilan.peer@intel.com>2014-02-23 09:13:00 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-04-09 10:55:33 +0200
commit94fc661f68c881eaa3a5904c12a2269372aa94d9 (patch)
treead1f653098242598a1b82f78611bc2ff08b208bb /net/wireless
parentcfg80211: Add indoor only and GO concurrent channel attributes (diff)
downloadlinux-dev-94fc661f68c881eaa3a5904c12a2269372aa94d9.tar.xz
linux-dev-94fc661f68c881eaa3a5904c12a2269372aa94d9.zip
cfg80211: Add Kconfig option for cellular BS hints
Move the regulatory cellular base station hints support under a specific configuration option and make the option depend on CFG80211_CERTIFICATION_ONUS. Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/Kconfig13
-rw-r--r--net/wireless/reg.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 16d08b399210..2a891bc6315c 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -95,6 +95,19 @@ config CFG80211_CERTIFICATION_ONUS
you are a wireless researcher and are working in a controlled
and approved environment by your local regulatory agency.
+config CFG80211_REG_CELLULAR_HINTS
+ bool "cfg80211 regulatory support for cellular base station hints"
+ depends on CFG80211_CERTIFICATION_ONUS
+ ---help---
+ This option enables support for parsing regulatory hints
+ from cellular base stations. If enabled and at least one driver
+ claims support for parsing cellular base station hints the
+ regulatory core will allow and parse these regulatory hints.
+ The regulatory core will only apply these regulatory hints on
+ drivers that support this feature. You should only enable this
+ feature if you have tested and validated this feature on your
+ systems.
+
config CFG80211_DEFAULT_PS
bool "enable powersave by default"
depends on CFG80211
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1e9dc1cba335..2b8c1000c1be 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1133,7 +1133,7 @@ bool reg_last_request_cell_base(void)
return reg_request_cell_base(get_last_request());
}
-#ifdef CONFIG_CFG80211_CERTIFICATION_ONUS
+#ifdef CONFIG_CFG80211_REG_CELLULAR_HINTS
/* Core specific check */
static enum reg_request_treatment
reg_ignore_cell_hint(struct regulatory_request *pending_request)