aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-03-22 20:24:32 +0100
committerFelix Fietkau <nbd@nbd.name>2017-03-22 20:49:28 +0100
commit79a768a90fa94c0a38c9def1992cc974c091e286 (patch)
tree90cf790b755cd53f9091cac21867a6ac6e572679 /package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
parent89118da865a34ed9537a088196d81ca9e37cb983 (diff)
downloadupstream-79a768a90fa94c0a38c9def1992cc974c091e286.tar.gz
upstream-79a768a90fa94c0a38c9def1992cc974c091e286.tar.bz2
upstream-79a768a90fa94c0a38c9def1992cc974c091e286.zip
ath: do not apply broken power limits with ATH_USER_REGD
If a device uses the default EEPROM code, typically only the main CTLs are valid, and they do not apply properly when switching to a different regulatory domain. If the regdomain deviates from the EEPROM one, force the world roaming regdomain to ensure that power limits are sane Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/406-ath_relax_default_regd.patch')
-rw-r--r--package/kernel/mac80211/patches/406-ath_relax_default_regd.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
index b6190b9363..35b0f2b76e 100644
--- a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
+++ b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
-@@ -114,6 +114,16 @@ static const struct ieee80211_regdomain
+@@ -115,6 +115,16 @@ static const struct ieee80211_regdomain
)
};
@@ -17,7 +17,7 @@
static bool dynamic_country_user_possible(struct ath_regulatory *reg)
{
if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
-@@ -122,6 +132,9 @@ static bool dynamic_country_user_possibl
+@@ -123,6 +133,9 @@ static bool dynamic_country_user_possibl
if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
return true;
@@ -27,7 +27,7 @@
switch (reg->country_code) {
case CTRY_UNITED_STATES:
case CTRY_JAPAN1:
-@@ -207,11 +220,6 @@ static inline bool is_wwr_sku(u16 regd)
+@@ -208,11 +221,6 @@ static inline bool is_wwr_sku(u16 regd)
(regd == WORLD));
}
@@ -39,7 +39,7 @@
bool ath_is_world_regd(struct ath_regulatory *reg)
{
return is_wwr_sku(ath_regd_get_eepromRD(reg));
-@@ -652,6 +660,9 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -658,6 +666,9 @@ ath_regd_init_wiphy(struct ath_regulator
if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
return 0;