mac80211: merge a few pending upstream fixes

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

diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 8e64f1b1c6c88b16103d6fbb5468a6e4e2bd135d..d7dd4314fdc1e16af5e807527e32bc7b4020e03d 100644 (file)
--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/kernel/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
-@@ -558,6 +558,9 @@ struct ath9k_wow_pattern {
+@@ -812,6 +812,9 @@ static inline int ath9k_dump_btcoex(stru
  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,9 +10,9 @@
  #else
  static inline void ath_init_leds(struct ath_softc *sc)
  {
-@@ -732,6 +735,13 @@ enum spectral_mode {
-       SPECTRAL_CHANSCAN,
- };
+@@ -952,6 +955,13 @@ void ath_ant_comb_scan(struct ath_softc 
+ 
+ #define ATH9K_NUM_CHANCTX  2 /* supports 2 operating channels */
  
 +struct ath_led {
 +      struct list_head list;
@@ -24,8 +24,8 @@
  struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
-@@ -774,9 +784,8 @@ struct ath_softc {
-       struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
+@@ -1003,9 +1013,8 @@ struct ath_softc {
+       spinlock_t chan_lock;
  
  #ifdef CPTCFG_MAC80211_LEDS
 -      bool led_registered;
@@ -35,7 +35,7 @@
 +      struct list_head leds;
  #endif
  
-       struct ath9k_hw_cal_data caldata;
+ #ifdef CPTCFG_ATH9K_DEBUGFS
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
 @@ -24,40 +24,102 @@
@@ -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
-@@ -993,7 +993,7 @@ int ath9k_init_device(u16 devid, struct 
+@@ -902,7 +902,7 @@ int ath9k_init_device(u16 devid, struct 
  
  #ifdef CPTCFG_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
-@@ -1874,6 +1874,61 @@ static const struct file_operations fops
+@@ -1406,6 +1406,61 @@ static const struct file_operations fops
        .llseek = default_llseek,
  };
  
@@ -235,7 +235,7 @@
  
  int ath9k_init_debug(struct ath_hw *ah)
  {
-@@ -1897,6 +1952,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1430,6 +1485,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);