summaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-11-05 09:18:11 -0800
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 20:51:23 +0100
commitf75c30ef084fb57d3edab6722077e0adf16ed8fd (patch)
treef8585cc786183f42890ceaca9332af2094c33491 /net/wireless/reg.c
parentfe6631ff093150eabc4ab73b948577e9b3bc5b76 (diff)
downloadop-kernel-dev-f75c30ef084fb57d3edab6722077e0adf16ed8fd.zip
op-kernel-dev-f75c30ef084fb57d3edab6722077e0adf16ed8fd.tar.gz
cfg80211: allow only the core to request to update the world regdom
It seems some out of tree drivers were using a regulatory_hint("00") to trigger off the wiphy regulatory notifier, for those cases just setting the WIPHY_FLAG_CUSTOM_REGULATORY would suffice to call the reg_notifier() for a world regulatory domain update. If drivers find other needs for calling the reg_notifier() a proper implemenation is preferred. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r--net/wireless/reg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 130cfda..cd50bb5 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2200,6 +2200,8 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
return -EINVAL;
if (is_world_regdom(rd->alpha2)) {
+ if (lr->initiator != NL80211_REGDOM_SET_BY_CORE)
+ return -EINVAL;
update_world_regdomain(rd);
return 0;
}
OpenPOWER on IntegriCloud