diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-05-20 09:35:17 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-05-20 09:35:17 +0000 |
commit | 8513629e3ed39ac7d6d3ca90f1ad745db5c449d6 (patch) | |
tree | f38e2aa76f8ac55bf6eb361446250acce57956c5 /package/kernel/mac80211/patches/530-ath9k_extra_leds.patch | |
parent | 8f526ff53067d029f42e0b887d770b28546fc0e9 (diff) | |
download | master-31e0f0ae-8513629e3ed39ac7d6d3ca90f1ad745db5c449d6.tar.gz master-31e0f0ae-8513629e3ed39ac7d6d3ca90f1ad745db5c449d6.tar.bz2 master-31e0f0ae-8513629e3ed39ac7d6d3ca90f1ad745db5c449d6.zip |
mac80211: update to wireless-testing 2014-05-19
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40800
Diffstat (limited to 'package/kernel/mac80211/patches/530-ath9k_extra_leds.patch')
-rw-r--r-- | package/kernel/mac80211/patches/530-ath9k_extra_leds.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch index c78a3e55fb..4cf0700951 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 -@@ -554,6 +554,9 @@ static inline int ath9k_dump_btcoex(stru +@@ -563,6 +563,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,7 +10,7 @@ #else static inline void ath_init_leds(struct ath_softc *sc) { -@@ -692,6 +695,13 @@ void ath_ant_comb_scan(struct ath_softc +@@ -701,6 +704,13 @@ void ath_ant_comb_scan(struct ath_softc #define PS_BEACON_SYNC BIT(4) #define PS_WAIT_FOR_ANI BIT(5) @@ -24,7 +24,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; -@@ -731,9 +741,8 @@ struct ath_softc { +@@ -743,9 +753,8 @@ struct ath_softc { struct ath_beacon beacon; #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 -@@ -811,7 +811,7 @@ int ath9k_init_device(u16 devid, struct +@@ -815,7 +815,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 -@@ -1577,6 +1577,61 @@ static const struct file_operations fops +@@ -1381,6 +1381,61 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -235,7 +235,7 @@ int ath9k_init_debug(struct ath_hw *ah) { -@@ -1601,6 +1656,10 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1405,6 +1460,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); |