mac80211: make it work with 3.18.12+

[openwrt/staging/blogic.git] / package / kernel / mac80211 / patches / 306-ath5k-fix-reset-race.patch

diff --git a/package/kernel/mac80211/patches/306-ath5k-fix-reset-race.patch b/package/kernel/mac80211/patches/306-ath5k-fix-reset-race.patch
index 399076524d5a3852aebbc3443c3953430cc4610b..85a190481bc594da37eebb8ec6f9674043c7b435 100644 (file)
--- a/package/kernel/mac80211/patches/306-ath5k-fix-reset-race.patch
+++ b/package/kernel/mac80211/patches/306-ath5k-fix-reset-race.patch
@@ -66,7 +66,7 @@ Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
        unsigned int            fif_filter_flags; /* Current FIF_* filter flags */
 --- a/drivers/net/wireless/ath/ath5k/base.c
 +++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -1523,6 +1523,9 @@ ath5k_set_current_imask(struct ath5k_hw 
+@@ -1523,6 +1523,9 @@ ath5k_set_current_imask(struct ath5k_hw
        enum ath5k_int imask;
        unsigned long flags;
  
@@ -76,7 +76,7 @@ Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
        spin_lock_irqsave(&ah->irqlock, flags);
        imask = ah->imask;
        if (ah->rx_pending)
-@@ -2862,6 +2865,8 @@ ath5k_reset(struct ath5k_hw *ah, struct 
+@@ -2862,6 +2865,8 @@ ath5k_reset(struct ath5k_hw *ah, struct
  
        ATH5K_DBG(ah, ATH5K_DEBUG_RESET, "resetting\n");
  
@@ -85,7 +85,7 @@ Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
        ath5k_hw_set_imr(ah, 0);
        synchronize_irq(ah->irq);
        ath5k_stop_tasklets(ah);
-@@ -2952,6 +2957,8 @@ ath5k_reset(struct ath5k_hw *ah, struct 
+@@ -2952,6 +2957,8 @@ ath5k_reset(struct ath5k_hw *ah, struct
         */
  /*    ath5k_chan_change(ah, c); */