ath9k: fix some ps wakeup/restore issues that led to crashes and other weird behavior

[openwrt.git] / package / mac80211 / patches / 510-ath9k_led_cleanup.patch

diff --git a/package/mac80211/patches/510-ath9k_led_cleanup.patch b/package/mac80211/patches/510-ath9k_led_cleanup.patch
index 626bc0c..570639d 100644 (file)
--- a/package/mac80211/patches/510-ath9k_led_cleanup.patch
+++ b/package/mac80211/patches/510-ath9k_led_cleanup.patch
@@ -38,7 +38,7 @@
  
  /* Antenna diversity/combining */
  #define ATH_ANT_RX_CURRENT_SHIFT 4
  
  /* Antenna diversity/combining */
  #define ATH_ANT_RX_CURRENT_SHIFT 4

-@@ -611,15 +605,11 @@ struct ath_softc {
+@@ -625,15 +619,11 @@ struct ath_softc {

        struct ath_beacon beacon;
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  
        struct ath_beacon beacon;
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  


@@ -253,7 +253,7 @@
  /*    Rfkill     */
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
  /*    Rfkill     */
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -1296,9 +1296,6 @@ static void ath9k_stop(struct ieee80211_
+@@ -1281,9 +1281,6 @@ static void ath9k_stop(struct ieee80211_

  
        aphy->state = ATH_WIPHY_INACTIVE;
  
  
        aphy->state = ATH_WIPHY_INACTIVE;
  


@@ -265,7 +265,7 @@
        cancel_work_sync(&sc->hw_check_work);
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
        cancel_work_sync(&sc->hw_check_work);
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c

-@@ -143,6 +143,21 @@ static struct ieee80211_rate ath9k_legac
+@@ -145,6 +145,21 @@ static struct ieee80211_rate ath9k_legac

        RATE(540, 0x0c, 0),
  };
  
        RATE(540, 0x0c, 0),
  };
  


@@ -287,7 +287,7 @@
  static void ath9k_deinit_softc(struct ath_softc *sc);
  
  /*
  static void ath9k_deinit_softc(struct ath_softc *sc);
  
  /*

-@@ -745,6 +760,13 @@ int ath9k_init_device(u16 devid, struct 
+@@ -747,6 +762,13 @@ int ath9k_init_device(u16 devid, struct 

  
        ath9k_init_txpower_limits(sc);
  
  
        ath9k_init_txpower_limits(sc);