diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
commit | 8be721208dad06c6a3119dee2db81c385a91a336 (patch) | |
tree | 70eddd3a592f75ebfb105dc619735d0c5178c471 /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | |
parent | 54a18b3fe80d6cfe06acda47c7d4d82c0d0e5688 (diff) | |
download | mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.zip mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.gz mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.bz2 |
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42683
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
-rw-r--r-- | package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch index 984955f..578f803 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 -@@ -1437,6 +1437,50 @@ static const struct file_operations fops +@@ -1466,6 +1466,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); -@@ -1464,6 +1508,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1493,6 +1537,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 -@@ -482,6 +482,12 @@ enum { +@@ -483,6 +483,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -762,6 +768,8 @@ struct ath_hw { +@@ -763,6 +769,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1013,6 +1021,7 @@ void ath9k_hw_check_nav(struct ath_hw *a +@@ -1017,6 +1025,7 @@ void ath9k_hw_check_nav(struct ath_hw *a bool ath9k_hw_check_alive(struct ath_hw *ah); bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode); @@ -94,9 +94,9 @@ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah, --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1738,6 +1738,20 @@ fail: - return -EINVAL; +@@ -1763,6 +1763,20 @@ u32 ath9k_hw_get_tsf_offset(struct times } + EXPORT_SYMBOL(ath9k_hw_get_tsf_offset); +void ath9k_hw_update_diag(struct ath_hw *ah) +{ @@ -115,7 +115,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, struct ath9k_hw_cal_data *caldata, bool fastcc) { -@@ -1943,6 +1957,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1965,6 +1979,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st ar9003_hw_disable_phy_restart(ah); 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 -@@ -606,6 +606,11 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -531,6 +531,11 @@ irqreturn_t ath_isr(int irq, void *dev) ath9k_debug_sync_cause(sc, sync_cause); status &= ah->imask; /* discard unasked-for bits */ |