mac80211: update to wireless-testing 2012-02-27

[openwrt.git] / package / mac80211 / patches / 560-ath9k_extra_leds.patch

diff --git a/package/mac80211/patches/560-ath9k_extra_leds.patch b/package/mac80211/patches/560-ath9k_extra_leds.patch
index adf2a0e..ed749ed 100644 (file)
--- a/package/mac80211/patches/560-ath9k_extra_leds.patch
+++ b/package/mac80211/patches/560-ath9k_extra_leds.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -475,6 +475,9 @@ void ath9k_btcoex_timer_pause(struct ath
+@@ -505,6 +505,9 @@ static inline u16 ath9k_btcoex_aggr_limi
  #ifdef CONFIG_MAC80211_LEDS
  void ath_init_leds(struct ath_softc *sc);
  void ath_deinit_leds(struct ath_softc *sc);
@@ -10,7 +10,7 @@
  #else
  static inline void ath_init_leds(struct ath_softc *sc)
  {
-@@ -595,6 +598,13 @@ struct ath9k_vif_iter_data {
+@@ -625,6 +628,13 @@ struct ath9k_vif_iter_data {
        int nothers;   /* number of vifs not specified above. */
  };
  
@@ -24,7 +24,7 @@
  struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
-@@ -638,9 +648,8 @@ struct ath_softc {
+@@ -668,9 +678,8 @@ struct ath_softc {
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  
  #ifdef CONFIG_MAC80211_LEDS
@@ -171,7 +171,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -817,7 +817,7 @@ int ath9k_init_device(u16 devid, struct 
+@@ -757,7 +757,7 @@ int ath9k_init_device(u16 devid, struct 
  
  #ifdef CONFIG_MAC80211_LEDS
        /* must be initialized before ieee80211_register_hw */
@@ -182,7 +182,7 @@
  #endif
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1304,6 +1304,61 @@ static const struct file_operations fops
+@@ -1247,6 +1247,61 @@ static const struct file_operations fops
        .llseek = default_llseek,
  };
  
@@ -244,7 +244,7 @@
  void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
  {
  #define ATH_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].c)
-@@ -1728,6 +1783,11 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1671,6 +1726,11 @@ int ath9k_init_debug(struct ath_hw *ah)
        debugfs_create_file("samples", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_samps);