AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY

Browse Source 
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>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2010-10-20 10:18:54 -07:00 committed by John W. Linville
parent 7ca43d03b1
commit 749b527b21
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/net/cfg80211.h
View File

@ -1321,13 +1321,14 @@ struct cfg80211_ops {
* initiator is %REGDOM_SET_BY_CORE). * initiator is %REGDOM_SET_BY_CORE).
* @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will * @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will
* ignore regulatory domain settings until it gets its own regulatory * ignore regulatory domain settings until it gets its own regulatory
* domain via its regulatory_hint(). After its gets its own regulatory * domain via its regulatory_hint() unless the regulatory hint is
* domain it will only allow further regulatory domain settings to * from a country IE. After its gets its own regulatory domain it will
* further enhance compliance. For example if channel 13 and 14 are * only allow further regulatory domain settings to further enhance
* disabled by this regulatory domain no user regulatory domain can * compliance. For example if channel 13 and 14 are disabled by this
* enable these channels at a later time. This can be used for devices * regulatory domain no user regulatory domain can enable these channels
* which do not have calibration information gauranteed for frequencies * at a later time. This can be used for devices which do not have
* or settings outside of its regulatory domain. * calibration information guaranteed for frequencies or settings
* outside of its regulatory domain.
* @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
* that passive scan flags and beaconing flags may not be lifted by * that passive scan flags and beaconing flags may not be lifted by
* cfg80211 due to regulatory beacon hints. For more information on beacon * cfg80211 due to regulatory beacon hints. For more information on beacon

1
net/wireless/reg.c
View File

@ -813,6 +813,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
* desired regulatory domain set * desired regulatory domain set
*/ */
if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd && if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
!is_world_regdom(last_request->alpha2)) !is_world_regdom(last_request->alpha2))
return true; return true;
return false; return false;