diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-21 10:26:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-21 10:26:17 -0500 |
| commit | 7acd71879ce408af2d2ca3cd3ec3a86d0667ceae (patch) | |
| tree | 8332fdffc7980575268f902c1cffe37ee2587a4d /drivers/net/wireless/ath/regd.c | |
| parent | 68c6beb373955da0886d8f4f5995b3922ceda4be (diff) | |
| parent | 3b1bace9960b0acbcb5d0ca194077f03df7cc2c0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/regd.c')
| -rw-r--r-- | drivers/net/wireless/ath/regd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index c00687e05688..1217c52ab28e 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); |