mac80211: merge a few pending upstream fixes

[openwrt.git] / package / kernel / mac80211 / patches / 544-ath9k-ar933x-usb-hang-workaround.patch

diff --git a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
index b6e7b73..68d121a 100644 (file)
--- a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
+++ b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
@@ -20,7 +20,7 @@
  /******************/
  /* Chip Revisions */
  /******************/
-@@ -1351,6 +1364,9 @@ static bool ath9k_hw_set_reset(struct at
+@@ -1338,6 +1351,9 @@ static bool ath9k_hw_set_reset(struct at
        if (AR_SREV_9100(ah))
                udelay(50);
  
@@ -30,7 +30,7 @@
        return true;
  }
  
-@@ -1450,6 +1466,9 @@ static bool ath9k_hw_chip_reset(struct a
+@@ -1437,6 +1453,9 @@ static bool ath9k_hw_chip_reset(struct a
                ar9003_hw_internal_regulator_apply(ah);
        ath9k_hw_init_pll(ah, chan);
  
@@ -40,7 +40,7 @@
        return true;
  }
  
-@@ -1744,8 +1763,14 @@ static int ath9k_hw_do_fastcc(struct ath
+@@ -1731,8 +1750,14 @@ static int ath9k_hw_do_fastcc(struct ath
        if (AR_SREV_9271(ah))
                ar9002_hw_load_ani_reg(ah, chan);
  
@@ -55,7 +55,7 @@
        return -EINVAL;
  }
  
-@@ -1995,6 +2020,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1982,6 +2007,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
                ath9k_hw_set_radar_params(ah);
        }