summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-11-12 19:33:20 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-11-15 14:27:25 -0500
commit3e850edd58800e7b9b29a8dc2c950ebdf489a3e3 (patch)
treef1d28c90264dd0b3260624a30971ebebfd6bd1d9
parent32019c739c95d056575e0bb2381f2846c0c49944 (diff)
downloadop-kernel-dev-3e850edd58800e7b9b29a8dc2c950ebdf489a3e3.zip
op-kernel-dev-3e850edd58800e7b9b29a8dc2c950ebdf489a3e3.tar.gz
ath: fix dynamic user regulatory settings
A world regulatory domain check was in place that prevents user dynamic regulatory hints from being processed. This was there for historical reasons as this was only possible previously for world roaming cards and dynamic regulatory settings was only possible for country IEs. Fix this by enforcing the world regulatory domain check only for when the initiator is a country IE. Support for dynamic user regulatory support is already checked. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/regd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index c00687e..1217c52 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -362,7 +362,8 @@ static int __ath_reg_dyn_country(struct wiphy *wiphy,
{
u16 country_code;
- if (!ath_is_world_regd(reg))
+ if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+ !ath_is_world_regd(reg))
return -EINVAL;
country_code = ath_regd_find_country_by_name(request->alpha2);
OpenPOWER on IntegriCloud