aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-11-18 19:58:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-11-18 19:58:53 +0000
commit03fcc9bf43b27157fba896cb7d48a7e4ca4d02ee (patch)
treea96a3c285c7489763e92ed0508586471467f1809 /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
parent9706d4e00e4309b0872df87635d214d5a169827d (diff)
downloadupstream-03fcc9bf43b27157fba896cb7d48a7e4ca4d02ee.tar.gz
upstream-03fcc9bf43b27157fba896cb7d48a7e4ca4d02ee.tar.bz2
upstream-03fcc9bf43b27157fba896cb7d48a7e4ca4d02ee.zip
ath9k: merge a few reset / calibration fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 38854
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
-rw-r--r--package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
index b17585575a..ba64587e3f 100644
--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
@@ -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:
+@@ -1863,6 +1863,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)
{
-@@ -2060,6 +2074,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -2065,6 +2079,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
}
ath9k_hw_apply_gpio_override(ah);