diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 11:12:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 11:12:51 +0000 |
| commit | b798df3e960f6bcb4910a4bee447ccadc0bb7d97 (patch) | |
| tree | a256166036fffae990f5120e9956e16f615f1920 /package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch | |
| parent | fe2deddd963b480b2a957698bc9e193aef66a4ec (diff) | |
| download | upstream-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.tar.gz upstream-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.tar.bz2 upstream-b798df3e960f6bcb4910a4bee447ccadc0bb7d97.zip | |
mac80211: merge a few pending upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43208 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch index e536e1e9ed..304eb7dc8a 100644 --- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch +++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch @@ -18,7 +18,7 @@ void (*spectral_scan_trigger)(struct ath_hw *ah); --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c -@@ -1783,6 +1783,26 @@ static void ar9003_hw_tx99_set_txpower(s +@@ -1796,6 +1796,26 @@ static void ar9003_hw_tx99_set_txpower(s ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14], 0)); } @@ -45,7 +45,7 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah) { struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah); -@@ -1818,6 +1838,7 @@ void ar9003_hw_attach_phy_ops(struct ath +@@ -1831,6 +1851,7 @@ void ar9003_hw_attach_phy_ops(struct ath priv_ops->set_radar_params = ar9003_hw_set_radar_params; priv_ops->fast_chan_change = ar9003_hw_fast_chan_change; |