package/button-hotplug: handle KEY_RESTART and KEY_WPS_BUTTON codes as well

[openwrt.git] / package / mac80211 / patches / 550-ath9k_bb_fix.patch

diff --git a/package/mac80211/patches/550-ath9k_bb_fix.patch b/package/mac80211/patches/550-ath9k_bb_fix.patch
index 17bee7c..13eccae 100644 (file)
--- a/package/mac80211/patches/550-ath9k_bb_fix.patch
+++ b/package/mac80211/patches/550-ath9k_bb_fix.patch
@@ -1,7 +1,7 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1911,6 +1911,34 @@ static void ath9k_enable_rfkill(struct a
-       REG_SET_BIT(ah, AR_PHY_TEST, RFSILENT_BB);
+@@ -1172,6 +1172,34 @@ static bool ath9k_hw_channel_change(stru
+       return true;
  }
  
 +bool ath9k_hw_check_alive(struct ath_hw *ah)
@@ -15,8 +15,8 @@
 +      do {
 +              reg = REG_READ(ah, AR_OBS_BUS_1);
 +
-+              if ((reg & 0x7E7FFFEF) != 0x00702400)
-+                      return true;
++              if ((reg & 0x7E7FFFEF) == 0x00702400)
++                      continue;
 +
 +              switch (reg & 0x7E000B00) {
 +              case 0x1E000000:
@@ -37,7 +37,7 @@
  {
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -679,6 +679,7 @@ void ath9k_hw_set11nmac2040(struct ath_h
+@@ -869,6 +869,7 @@ void ath9k_hw_set11nmac2040(struct ath_h
  void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
  void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
                                    const struct ath9k_beacon_state *bs);
@@ -47,7 +47,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -405,7 +405,8 @@ void ath9k_tasklet(unsigned long data)
+@@ -406,7 +406,8 @@ void ath9k_tasklet(unsigned long data)
  
        ath9k_ps_wakeup(sc);