kernel: bump 4.14 to 4.14.72

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / 402-ath_regd_optional.patch

diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
index c8ede7f58381103310d101f7d21913d0ffcd5272..8fa56f40a463632490d0c4f15696c1a5769ce3cc 100644 (file)
--- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
+++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
@@ -27,7 +27,7 @@
        if (!IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS))
                return false;
        if (!dynamic_country_user_possible(reg))
-@@ -341,6 +347,9 @@ ath_reg_apply_beaconing_flags(struct wip
+@@ -345,6 +351,9 @@ ath_reg_apply_beaconing_flags(struct wip
        struct ieee80211_channel *ch;
        unsigned int i;
  
@@ -37,7 +37,7 @@
        for (band = 0; band < NUM_NL80211_BANDS; band++) {
                if (!wiphy->bands[band])
                        continue;
-@@ -374,6 +383,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip
+@@ -378,6 +387,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip
  {
        struct ieee80211_supported_band *sband;
  
@@ -47,7 +47,7 @@
        sband = wiphy->bands[NL80211_BAND_2GHZ];
        if (!sband)
                return;
-@@ -402,6 +414,9 @@ static void ath_reg_apply_radar_flags(st
+@@ -407,6 +419,9 @@ static void ath_reg_apply_radar_flags(st
        struct ieee80211_channel *ch;
        unsigned int i;
  
@@ -57,19 +57,7 @@
        if (!wiphy->bands[NL80211_BAND_5GHZ])
                return;
  
-@@ -539,6 +554,11 @@ void ath_reg_notifier_apply(struct wiphy
-               ath_reg_dyn_country(wiphy, reg, request);
-               break;
-       }
-+
-+      /* Prevent broken CTLs from being applied */
-+      if (IS_ENABLED(CPTCFG_ATH_USER_REGD) &&
-+          reg->regpair != common->reg_world_copy.regpair)
-+              reg->regpair = ath_get_regpair(WOR0_WORLD);
- }
- EXPORT_SYMBOL(ath_reg_notifier_apply);
- 
-@@ -634,6 +654,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -639,6 +654,10 @@ ath_regd_init_wiphy(struct ath_regulator
        const struct ieee80211_regdomain *regd;
  
        wiphy->reg_notifier = reg_notifier;
@@ -80,18 +68,6 @@
        wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
                                   REGULATORY_CUSTOM_REG;
  
-@@ -762,10 +786,7 @@ ath_regd_init(struct ath_regulatory *reg
-       if (r)
-               return r;
- 
--      if (ath_is_world_regd(reg))
--              memcpy(&common->reg_world_copy, reg,
--                     sizeof(struct ath_regulatory));
--
-+      memcpy(&common->reg_world_copy, reg, sizeof(struct ath_regulatory));
-       ath_regd_init_wiphy(reg, wiphy, reg_notifier);
- 
-       return 0;
 --- a/drivers/net/wireless/ath/Kconfig
 +++ b/drivers/net/wireless/ath/Kconfig
 @@ -23,6 +23,9 @@ config WLAN_VENDOR_ATH
@@ -104,9 +80,9 @@
  config ATH_DEBUG
        bool "Atheros wireless debugging"
        ---help---
---- a/.local-symbols
-+++ b/.local-symbols
-@@ -130,6 +130,7 @@ ADM8211=
+--- a/local-symbols
++++ b/local-symbols
+@@ -87,6 +87,7 @@ ADM8211=
  ATH_COMMON=
  WLAN_VENDOR_ATH=
  ATH_DEBUG=