mac80211: update to wireless-testing 2013-02-22

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

diff --git a/package/mac80211/patches/530-ath9k_extra_leds.patch b/package/mac80211/patches/530-ath9k_extra_leds.patch
index a93b625241eda729c6f7d34d7675ce34f70d3e00..804785bc1753187e692785507c6980ef70ac5aa6 100644 (file)
--- a/package/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/mac80211/patches/530-ath9k_extra_leds.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -548,6 +548,9 @@ struct ath9k_wow_pattern {
+@@ -551,6 +551,9 @@ struct ath9k_wow_pattern {
  void ath_init_leds(struct ath_softc *sc);
  void ath_deinit_leds(struct ath_softc *sc);
  void ath_fill_led_pin(struct ath_softc *sc);
@@ -10,8 +10,8 @@
  #else
  static inline void ath_init_leds(struct ath_softc *sc)
  {
-@@ -666,6 +669,13 @@ struct ath9k_vif_iter_data {
-       int nadhocs;   /* number of adhoc vifs */
+@@ -686,6 +689,13 @@ enum spectral_mode {
+       SPECTRAL_CHANSCAN,
  };
  
 +struct ath_led {
@@ -24,7 +24,7 @@
  struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
-@@ -707,9 +717,8 @@ struct ath_softc {
+@@ -727,9 +737,8 @@ struct ath_softc {
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  
  #ifdef CONFIG_MAC80211_LEDS
@@ -162,7 +162,7 @@
  void ath_fill_led_pin(struct ath_softc *sc)
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -865,7 +865,7 @@ int ath9k_init_device(u16 devid, struct 
+@@ -870,7 +870,7 @@ int ath9k_init_device(u16 devid, struct 
  
  #ifdef CONFIG_MAC80211_LEDS
        /* must be initialized before ieee80211_register_hw */
@@ -173,7 +173,7 @@
  #endif
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1196,6 +1196,61 @@ static const struct file_operations fops
+@@ -1482,6 +1482,61 @@ static const struct file_operations fops
        .llseek = default_llseek,
  };
  
@@ -235,7 +235,7 @@
  #ifdef CONFIG_ATH9K_MAC_DEBUG
  
  void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
-@@ -1829,6 +1884,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -2115,6 +2170,10 @@ int ath9k_init_debug(struct ath_hw *ah)
                            &fops_eeprom);
        debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
                            sc, &fops_chanbw);