ath: do not apply broken power limits with ATH_USER_REGD

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 406-ath_relax_default_regd.patch

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 83ec441b86cc95bb28fd56acbe410be99d715bb8..35b0f2b76eff9b1fd0f69c98aaaf61da8ac59921 100644 (file)
--- 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,10 +114,22 @@ static const struct ieee80211_regdomain 
+@@ -115,6 +115,16 @@ static const struct ieee80211_regdomain
        )
  };
  
@@ -16,14 +16,18 @@
 +
  static bool dynamic_country_user_possible(struct ath_regulatory *reg)
  {
-       if (config_enabled(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
+       if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
+@@ -123,6 +133,9 @@ static bool dynamic_country_user_possibl
+       if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
                return true;
+ 
 +      if (is_default_regd(reg))
 +              return true;
- 
++
        switch (reg->country_code) {
        case CTRY_UNITED_STATES:
-@@ -202,11 +214,6 @@ static inline bool is_wwr_sku(u16 regd)
+       case CTRY_JAPAN1:
+@@ -208,11 +221,6 @@ static inline bool is_wwr_sku(u16 regd)
                (regd == WORLD));
  }
  
@@ -35,9 +39,9 @@
  bool ath_is_world_regd(struct ath_regulatory *reg)
  {
        return is_wwr_sku(ath_regd_get_eepromRD(reg));
-@@ -650,6 +657,9 @@ ath_regd_init_wiphy(struct ath_regulator
-       return 0;
- #endif
+@@ -658,6 +666,9 @@ ath_regd_init_wiphy(struct ath_regulator
+       if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
+               return 0;
  
 +      if (is_default_regd(reg))
 +              return 0;