projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
ath
/
regd.c
diff --git
a/drivers/net/wireless/ath/regd.c
b/drivers/net/wireless/ath/regd.c
index bef5539192c609b55aecb4dd2d829d74b95ab090..d3bbf48522b62e1af70cdea2685c74d3ab25d29f 100644
(file)
--- a/
drivers/net/wireless/ath/regd.c
+++ b/
drivers/net/wireless/ath/regd.c
@@
-355,7
+355,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);