diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-22 11:36:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-22 11:36:38 +0000 |
| commit | 4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766 (patch) | |
| tree | b7b2ab7270ddc7ffc69f7c24a3e918606d348794 /package/mac80211/patches/542-ath9k_debugfs_diag.patch | |
| parent | ad639a0cd548c1d3fdd5fab7d0f9bf938ba2a2d9 (diff) | |
| download | upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.tar.gz upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.tar.bz2 upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.zip | |
AA: mac80211: merge ath9k fixes from bbattitude_adjustment
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@42647 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/542-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/mac80211/patches/542-ath9k_debugfs_diag.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/mac80211/patches/542-ath9k_debugfs_diag.patch index 2a5635276c..984955f272 100644 --- a/package/mac80211/patches/542-ath9k_debugfs_diag.patch +++ b/package/mac80211/patches/542-ath9k_debugfs_diag.patch @@ -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 -@@ -1735,6 +1735,20 @@ fail: +@@ -1738,6 +1738,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) { -@@ -1940,6 +1954,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1943,6 +1957,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st ar9003_hw_disable_phy_restart(ah); ath9k_hw_apply_gpio_override(ah); |