mac80211: update to wireless-testing 2017-11-01

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 551-ath9k_ubnt_uap_plus_hsr.patch

diff --git a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch
index 6d541d6a57d80196a0bb6775883fd3b7370ffccd..82b8109e069c5f89c493dd923e5ef0af6e259cd3 100644 (file)
--- a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch
+++ b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch
@@ -17,7 +17,7 @@
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ieee80211_hw *hw = sc->hw;
-@@ -41,6 +44,11 @@ static int ath_set_channel(struct ath_so
+@@ -42,6 +45,11 @@ static int ath_set_channel(struct ath_so
        ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",
                chan->center_freq, chandef->width);
  
@@ -27,7 +27,7 @@
 +      }
 +
        /* update survey stats for the old channel before switching */
-       spin_lock_bh(&common->cc_lock);
+       spin_lock_irqsave(&common->cc_lock, flags);
        ath_update_survey_stats(sc);
 --- /dev/null
 +++ b/drivers/net/wireless/ath/ath9k/hsr.c
@@ -343,7 +343,7 @@
  
  u8 ath9k_parse_mpdudensity(u8 mpdudensity)
  {
-@@ -648,6 +650,7 @@ void ath_reset_work(struct work_struct *
+@@ -649,6 +651,7 @@ void ath_reset_work(struct work_struct *
  static int ath9k_start(struct ieee80211_hw *hw)
  {
        struct ath_softc *sc = hw->priv;
@@ -351,7 +351,7 @@
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
-@@ -726,6 +729,11 @@ static int ath9k_start(struct ieee80211_
+@@ -727,6 +730,11 @@ static int ath9k_start(struct ieee80211_
                                          AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
        }
  
@@ -386,7 +386,7 @@
  #endif /* _LINUX_ATH9K_PLATFORM_H */
 --- a/local-symbols
 +++ b/local-symbols
-@@ -109,6 +109,7 @@ ATH9K_WOW=
+@@ -114,6 +114,7 @@ ATH9K_WOW=
  ATH9K_RFKILL=
  ATH9K_CHANNEL_CONTEXT=
  ATH9K_PCOEM=