diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
| commit | bac83378e74eeae366b80d209dcd7b442f1d4012 (patch) | |
| tree | 5b5c4aa12aef79d237bb7ce4e3f358c9f5546e25 /package/kernel/mac80211/patches/530-ath9k_extra_leds.patch | |
| parent | 5db5354c708f62a5c4814342334951dbd4e089e7 (diff) | |
| download | mtk-20170518-bac83378e74eeae366b80d209dcd7b442f1d4012.zip mtk-20170518-bac83378e74eeae366b80d209dcd7b442f1d4012.tar.gz mtk-20170518-bac83378e74eeae366b80d209dcd7b442f1d4012.tar.bz2 | |
ath9k: merge another round of upstream (or -pending) fixes and cleanups
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39138
Diffstat (limited to 'package/kernel/mac80211/patches/530-ath9k_extra_leds.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/530-ath9k_extra_leds.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch index 4557c27..5665c13 100644 --- 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 -@@ -557,6 +557,9 @@ struct ath9k_wow_pattern { +@@ -559,6 +559,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, - }; +@@ -704,6 +707,13 @@ enum sc_op_flags { + #define PS_BEACON_SYNC BIT(4) + #define PS_WAIT_FOR_ANI BIT(5) +struct ath_led { + struct list_head list; @@ -24,7 +24,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; -@@ -774,9 +784,8 @@ struct ath_softc { +@@ -746,9 +756,8 @@ struct ath_softc { struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; #ifdef CPTCFG_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 -@@ -1016,7 +1016,7 @@ int ath9k_init_device(u16 devid, struct +@@ -1014,7 +1014,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 +@@ -1620,6 +1620,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) +@@ -1644,6 +1699,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); |