From bdb2859a48ca744eeb3819803c1c56cf1f113496 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 6 Aug 2013 10:31:10 +0000 Subject: ath9k: fold the aggregation rework into 300-pending_work.patch (tracked as upstream submission) Signed-off-by: Felix Fietkau SVN-Revision: 37716 --- package/kernel/mac80211/patches/530-ath9k_extra_leds.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '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 b931d5f4cf..79eb9c84c9 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 { +@@ -556,6 +556,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,7 +10,7 @@ #else static inline void ath_init_leds(struct ath_softc *sc) { -@@ -697,6 +700,13 @@ enum spectral_mode { +@@ -696,6 +699,13 @@ enum spectral_mode { SPECTRAL_CHANSCAN, }; @@ -24,7 +24,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; -@@ -739,9 +749,8 @@ struct ath_softc { +@@ -738,9 +748,8 @@ struct ath_softc { struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; #ifdef CPTCFG_MAC80211_LEDS @@ -173,7 +173,7 @@ #endif --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1825,6 +1825,61 @@ static const struct file_operations fops +@@ -1836,6 +1836,61 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -235,7 +235,7 @@ int ath9k_init_debug(struct ath_hw *ah) { -@@ -1847,6 +1902,10 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1858,6 +1913,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); -- cgit v1.2.3