diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-06-15 20:14:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-06-15 20:14:06 +0000 |
| commit | 5fb5b75668de4905edba27be4f503316e298b2e4 (patch) | |
| tree | 1412b60e597f5cd3c927166f71c0bd3860e2a766 /package/mac80211/patches/530-ath9k_extra_leds.patch | |
| parent | ed11b6185b5c087dc4acabf1a43c6b82698169d1 (diff) | |
| download | upstream-5fb5b75668de4905edba27be4f503316e298b2e4.tar.gz upstream-5fb5b75668de4905edba27be4f503316e298b2e4.tar.bz2 upstream-5fb5b75668de4905edba27be4f503316e298b2e4.zip | |
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36939 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/530-ath9k_extra_leds.patch')
| -rw-r--r-- | package/mac80211/patches/530-ath9k_extra_leds.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/mac80211/patches/530-ath9k_extra_leds.patch b/package/mac80211/patches/530-ath9k_extra_leds.patch index ce6a0c68f3..134b0978b2 100644 --- a/package/mac80211/patches/530-ath9k_extra_leds.patch +++ b/package/mac80211/patches/530-ath9k_extra_leds.patch @@ -10,7 +10,7 @@ #else static inline void ath_init_leds(struct ath_softc *sc) { -@@ -691,6 +694,13 @@ enum spectral_mode { +@@ -692,6 +695,13 @@ enum spectral_mode { SPECTRAL_CHANSCAN, }; @@ -24,10 +24,10 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; -@@ -732,9 +742,8 @@ struct ath_softc { +@@ -733,9 +743,8 @@ struct ath_softc { struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; - #ifdef CONFIG_MAC80211_LEDS + #ifdef CPTCFG_MAC80211_LEDS - bool led_registered; - char led_name[32]; - struct led_classdev led_cdev; @@ -162,9 +162,9 @@ 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 -@@ -895,7 +895,7 @@ int ath9k_init_device(u16 devid, struct +@@ -891,7 +891,7 @@ int ath9k_init_device(u16 devid, struct - #ifdef CONFIG_MAC80211_LEDS + #ifdef CPTCFG_MAC80211_LEDS /* must be initialized before ieee80211_register_hw */ - sc->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(sc->hw, + sc->led_default_trigger = ieee80211_create_tpt_led_trigger(sc->hw, @@ -173,7 +173,7 @@ #endif --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1489,6 +1489,61 @@ static const struct file_operations fops +@@ -1825,6 +1825,61 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -232,10 +232,10 @@ + +#endif + - #ifdef CONFIG_ATH9K_MAC_DEBUG - void ath9k_debug_samp_bb_mac(struct ath_softc *sc) -@@ -2124,6 +2179,10 @@ int ath9k_init_debug(struct ath_hw *ah) + int ath9k_init_debug(struct ath_hw *ah) + { +@@ -1847,6 +1902,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); |