diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-14 12:17:34 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-14 12:17:34 +0000 |
| commit | b5073ca2c859fe8763a0717abcfb5f5646d5a543 (patch) | |
| tree | 6129082df00db34e8fb6d44aaf14c0ac02b26d5d /package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | |
| parent | 5c9c6706165d3ce7276eed2c557089aa690c6529 (diff) | |
| download | master-31e0f0ae-b5073ca2c859fe8763a0717abcfb5f5646d5a543.tar.gz master-31e0f0ae-b5073ca2c859fe8763a0717abcfb5f5646d5a543.tar.bz2 master-31e0f0ae-b5073ca2c859fe8763a0717abcfb5f5646d5a543.zip | |
mac80211: merge a number of upstream driver fixes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45432
Diffstat (limited to 'package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch index ed420c29dd..5264da018a 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_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy, --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -499,6 +499,12 @@ enum { +@@ -513,6 +513,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -780,6 +786,8 @@ struct ath_hw { +@@ -794,6 +800,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1040,6 +1048,7 @@ void ath9k_hw_check_nav(struct ath_hw *a +@@ -1055,6 +1063,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 @@ 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 -@@ -1771,6 +1771,20 @@ u32 ath9k_hw_get_tsf_offset(struct times +@@ -1803,6 +1803,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) { -@@ -1977,6 +1991,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -2011,6 +2025,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st ar9003_hw_disable_phy_restart(ah); ath9k_hw_apply_gpio_override(ah); |