diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-10-20 10:18:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:46:58 -0800 |
| commit | 4bd652a53bd711ef0ef8d42c5525bc6d71aeef54 (patch) | |
| tree | 6279f464ef8a329e6ba61011f866a0bb87d65c1f /net | |
| parent | 6b7ea7728843a3e94eacdafc05bddb0206880bc0 (diff) | |
cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
commit 749b527b21465fb079796c03ffb4302584dc31c1 upstream.
We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
even if we haven't yet recieved regulatory domain hint for the driver
if it needed one. Without this Country IEs are not passed on to drivers
that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.
This was part of the original design, however it was completely
overlooked...
Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 21071487e7af..edccc093e71b 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -816,6 +816,7 @@ static bool ignore_reg_update(struct wiphy *wiphy, * desired regulatory domain set */ if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd && + initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE && !is_world_regdom(last_request->alpha2)) return true; return false; |