diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:56:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:56:25 +0000 |
| commit | ddbb25c6a79a0836a79eab96d9c0a293acee4089 (patch) | |
| tree | 510a754bcce3454e40903bf2f306a65939b7f546 /package/mac80211/patches/530-ath9k_extra_leds.patch | |
| parent | 5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4 (diff) | |
| download | upstream-ddbb25c6a79a0836a79eab96d9c0a293acee4089.tar.gz upstream-ddbb25c6a79a0836a79eab96d9c0a293acee4089.tar.bz2 upstream-ddbb25c6a79a0836a79eab96d9c0a293acee4089.zip | |
mac80211, ath9k: merge some pending fixes from linux-wireless@
SVN-Revision: 35066
Diffstat (limited to 'package/mac80211/patches/530-ath9k_extra_leds.patch')
| -rw-r--r-- | package/mac80211/patches/530-ath9k_extra_leds.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/530-ath9k_extra_leds.patch b/package/mac80211/patches/530-ath9k_extra_leds.patch index 7e982c4459..7eddd3f82f 100644 --- a/package/mac80211/patches/530-ath9k_extra_leds.patch +++ b/package/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 -@@ -551,6 +551,9 @@ struct ath9k_wow_pattern { +@@ -550,6 +550,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) { -@@ -670,6 +673,13 @@ struct ath9k_vif_iter_data { +@@ -668,6 +671,13 @@ struct ath9k_vif_iter_data { int nadhocs; /* number of adhoc vifs */ }; @@ -24,7 +24,7 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; -@@ -711,9 +721,8 @@ struct ath_softc { +@@ -709,9 +719,8 @@ struct ath_softc { struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; #ifdef CONFIG_MAC80211_LEDS @@ -173,7 +173,7 @@ #endif --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1197,6 +1197,61 @@ static const struct file_operations fops +@@ -1196,6 +1196,61 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -235,7 +235,7 @@ #ifdef CONFIG_ATH9K_MAC_DEBUG void ath9k_debug_samp_bb_mac(struct ath_softc *sc) -@@ -1830,6 +1885,10 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1829,6 +1884,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); |