summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-07 11:12:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-11-07 11:12:51 +0000
commit82e2aeb59952899bd0dbcf728d2e2788570a2561 (patch)
treeec5c863a0e8478c06c9420ec774bf13ce4373b1e /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
parent89f74722b7ec73cbfdd55f25e64cb4a391cbb35a (diff)
downloadmtk-20170518-82e2aeb59952899bd0dbcf728d2e2788570a2561.zip
mtk-20170518-82e2aeb59952899bd0dbcf728d2e2788570a2561.tar.gz
mtk-20170518-82e2aeb59952899bd0dbcf728d2e2788570a2561.tar.bz2
mac80211: merge a few pending upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43208
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
-rw-r--r--package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
index c8f9243..38c0c63 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
-@@ -1461,6 +1461,50 @@ static const struct file_operations fops
+@@ -1462,6 +1462,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);
-@@ -1488,6 +1532,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1489,6 +1533,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
@@ -94,7 +94,7 @@
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
-@@ -1766,6 +1766,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
+@@ -1753,6 +1753,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
}
EXPORT_SYMBOL(ath9k_hw_get_tsf_offset);
@@ -115,7 +115,7 @@
int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
struct ath9k_hw_cal_data *caldata, bool fastcc)
{
-@@ -1970,6 +1984,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1957,6 +1971,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
ar9003_hw_disable_phy_restart(ah);
ath9k_hw_apply_gpio_override(ah);