diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
| commit | bac83378e74eeae366b80d209dcd7b442f1d4012 (patch) | |
| tree | 5b5c4aa12aef79d237bb7ce4e3f358c9f5546e25 /package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch | |
| parent | 5db5354c708f62a5c4814342334951dbd4e089e7 (diff) | |
| download | master-31e0f0ae-bac83378e74eeae366b80d209dcd7b442f1d4012.tar.gz master-31e0f0ae-bac83378e74eeae366b80d209dcd7b442f1d4012.tar.bz2 master-31e0f0ae-bac83378e74eeae366b80d209dcd7b442f1d4012.zip | |
ath9k: merge another round of upstream (or -pending) fixes and cleanups
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39138
Diffstat (limited to 'package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch index b8209a54ee..6cd09bd6dd 100644 --- a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch +++ b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch @@ -8,7 +8,7 @@ * @spectral_scan_config: set parameters for spectral scan and enable/disable it * @spectral_scan_trigger: trigger a spectral scan run * @spectral_scan_wait: wait for a spectral scan run to finish -@@ -683,6 +684,7 @@ struct ath_hw_ops { +@@ -684,6 +685,7 @@ struct ath_hw_ops { struct ath_hw_antcomb_conf *antconf); void (*antdiv_comb_conf_set)(struct ath_hw *ah, struct ath_hw_antcomb_conf *antconf); @@ -55,7 +55,7 @@ ops->spectral_scan_config = ar9003_hw_spectral_scan_config; --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -847,7 +847,8 @@ static void ath9k_init_txpower_limits(st +@@ -845,7 +845,8 @@ static void ath9k_init_txpower_limits(st if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ); @@ -65,7 +65,7 @@ } void ath9k_reload_chainmask_settings(struct ath_softc *sc) -@@ -978,6 +979,18 @@ void ath9k_set_hw_capab(struct ath_softc +@@ -976,6 +977,18 @@ static void ath9k_set_hw_capab(struct at SET_IEEE80211_PERM_ADDR(hw, common->macaddr); } @@ -84,7 +84,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, const struct ath_bus_ops *bus_ops) { -@@ -1023,6 +1036,8 @@ int ath9k_init_device(u16 devid, struct +@@ -1021,6 +1034,8 @@ int ath9k_init_device(u16 devid, struct ARRAY_SIZE(ath9k_tpt_blink)); #endif @@ -95,7 +95,7 @@ if (error) --- a/drivers/net/wireless/ath/ath9k/hw-ops.h +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h -@@ -94,6 +94,12 @@ static inline void ath9k_hw_tx99_set_txp +@@ -95,6 +95,12 @@ static inline void ath9k_hw_tx99_set_txp ath9k_hw_ops(ah)->tx99_set_txpower(ah, power); } |