diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-20 18:33:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-20 18:33:21 +0000 |
| commit | e219c56a111b27b4be755f665d115dd49ccd6d39 (patch) | |
| tree | 5247da24e61b1380b61788732cb1f0fe4a0ee49f /package/mac80211/patches/553-ath9k_debugfs_diag.patch | |
| parent | 5bc6555e085565e837e75044864efe1a1ed0624b (diff) | |
| download | upstream-e219c56a111b27b4be755f665d115dd49ccd6d39.tar.gz upstream-e219c56a111b27b4be755f665d115dd49ccd6d39.tar.bz2 upstream-e219c56a111b27b4be755f665d115dd49ccd6d39.zip | |
ath9k: merge another round of cleanups and stability fixes, refresh patches
SVN-Revision: 35255
Diffstat (limited to 'package/mac80211/patches/553-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/mac80211/patches/553-ath9k_debugfs_diag.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/mac80211/patches/553-ath9k_debugfs_diag.patch index 078a7f878b..8a1fcf6624 100644 --- a/package/mac80211/patches/553-ath9k_debugfs_diag.patch +++ b/package/mac80211/patches/553-ath9k_debugfs_diag.patch @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -1002,6 +1010,7 @@ void ath9k_hw_set_sta_beacon_timers(stru +@@ -988,6 +996,7 @@ void ath9k_hw_set_sta_beacon_timers(stru 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 -@@ -1747,6 +1747,20 @@ fail: +@@ -1745,6 +1745,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) { -@@ -2024,6 +2038,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -2022,6 +2036,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 -@@ -463,6 +463,11 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -462,6 +462,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 */ |