diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-12-14 17:07:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-12-14 17:07:08 +0000 |
| commit | a55649082a4cc02e85d3292a4077548c180c92dd (patch) | |
| tree | b95a454e48f417c3975f71f2632be1bf2a4e8be0 /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | |
| parent | 9084b755067d4cafa4e22fe4f5211651b9355936 (diff) | |
| download | mtk-20170518-a55649082a4cc02e85d3292a4077548c180c92dd.zip mtk-20170518-a55649082a4cc02e85d3292a4077548c180c92dd.tar.gz mtk-20170518-a55649082a4cc02e85d3292a4077548c180c92dd.tar.bz2 | |
ath9k: merge another round of cleanups and fixes submitted to linux-wireless
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39054
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch index 0a43af1..cf5bbbe 100644 --- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch +++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch @@ -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 { +@@ -469,6 +469,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -767,6 +773,8 @@ struct ath_hw { +@@ -744,6 +750,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1019,6 +1027,7 @@ void ath9k_hw_check_nav(struct ath_hw *a +@@ -995,6 +1003,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,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 -@@ -1863,6 +1863,20 @@ fail: +@@ -1854,6 +1854,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) { -@@ -2065,6 +2079,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -2056,6 +2070,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 -@@ -571,6 +571,11 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -574,6 +574,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 */ |