diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-10-10 14:31:22 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-10-10 14:31:22 +0000 |
| commit | d45a1618eb4fe2b9d7ca1ef5b95df2e0ca158119 (patch) | |
| tree | 69a4d9749ff6c511bb39905d22d9d63bd4741a01 /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | |
| parent | a05d20a60f462ef3ebd90b4b966bf800efcbe67a (diff) | |
| download | master-31e0f0ae-d45a1618eb4fe2b9d7ca1ef5b95df2e0ca158119.tar.gz master-31e0f0ae-d45a1618eb4fe2b9d7ca1ef5b95df2e0ca158119.tar.bz2 master-31e0f0ae-d45a1618eb4fe2b9d7ca1ef5b95df2e0ca158119.zip | |
ath9k: add some cleanups and minor fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 38354
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch index c014bacb73..8cbe663892 100644 --- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch +++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -2017,6 +2017,50 @@ static const struct file_operations fops +@@ -2019,6 +2019,50 @@ static const struct file_operations fops #endif @@ -51,7 +51,7 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -2042,6 +2086,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -2044,6 +2088,8 @@ int ath9k_init_debug(struct ath_hw *ah) debugfs_create_file("gpio_led", S_IWUSR, sc->debug.debugfs_phy, sc, &fops_gpio_led); #endif @@ -62,7 +62,7 @@ debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc, --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -505,6 +505,12 @@ enum { +@@ -475,6 +475,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -785,6 +791,8 @@ struct ath_hw { +@@ -755,6 +761,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1035,6 +1043,7 @@ void ath9k_hw_set_sta_beacon_timers(stru +@@ -1005,6 +1013,7 @@ void ath9k_hw_set_sta_beacon_timers(stru bool ath9k_hw_check_alive(struct ath_hw *ah); bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode); @@ -94,7 +94,7 @@ void ath9k_debug_sync_cause(struct ath_common *common, u32 sync_cause); --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1861,6 +1861,20 @@ fail: +@@ -1840,6 +1840,20 @@ fail: return -EINVAL; } @@ -115,7 +115,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, struct ath9k_hw_cal_data *caldata, bool fastcc) { -@@ -2063,6 +2077,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -2039,6 +2053,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st } ath9k_hw_apply_gpio_override(ah); @@ -125,7 +125,7 @@ REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON); --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -472,6 +472,11 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -546,6 +546,11 @@ irqreturn_t ath_isr(int irq, void *dev) ath9k_hw_getisr(ah, &status); /* NB: clears ISR too */ status &= ah->imask; /* discard unasked-for bits */ |