mac80211: fix regdomain change issues with CONFIG_ATH_USER_REGD

[openwrt/staging/yousong.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 0598fa34f1421b3408fd08a58a9d77b05bf6be70..5b20b4518e2176114a12adb17a09d11c1db8ed71 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,11 +114,24 @@ static const struct ieee80211_regdomain
+@@ -114,6 +114,16 @@ static const struct ieee80211_regdomain
        )
  };
  
@@ -16,6 +16,8 @@
 +
  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
        if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
                return true;
  
@@ -25,7 +27,7 @@
        switch (reg->country_code) {
        case CTRY_UNITED_STATES:
        case CTRY_JAPAN1:
-@@ -202,11 +215,6 @@ static inline bool is_wwr_sku(u16 regd)
+@@ -207,11 +220,6 @@ static inline bool is_wwr_sku(u16 regd)
                (regd == WORLD));
  }
  
@@ -37,9 +39,9 @@
  bool ath_is_world_regd(struct ath_regulatory *reg)
  {
        return is_wwr_sku(ath_regd_get_eepromRD(reg));
-@@ -650,6 +658,9 @@ ath_regd_init_wiphy(struct ath_regulator
-       return 0;
- #endif
+@@ -651,6 +659,9 @@ ath_regd_init_wiphy(struct ath_regulator
+       if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
+               return 0;
  
 +      if (is_default_regd(reg))
 +              return 0;