diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
| commit | 3153b7589c0831fdce97081d1ecf5b9310725576 (patch) | |
| tree | 5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/550-ath9k_entropy_from_adc.patch | |
| parent | 312a176995ecf1b1b97a048451e4ff28b4336f85 (diff) | |
| download | upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2 upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip | |
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/550-ath9k_entropy_from_adc.patch')
| -rw-r--r-- | package/mac80211/patches/550-ath9k_entropy_from_adc.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/550-ath9k_entropy_from_adc.patch b/package/mac80211/patches/550-ath9k_entropy_from_adc.patch index b59c3624e1..7210a021bd 100644 --- a/package/mac80211/patches/550-ath9k_entropy_from_adc.patch +++ b/package/mac80211/patches/550-ath9k_entropy_from_adc.patch @@ -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 -@@ -846,7 +846,8 @@ static void ath9k_init_txpower_limits(st +@@ -646,7 +646,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); @@ -64,8 +64,8 @@ + ah->curchan = curchan; } - void ath9k_reload_chainmask_settings(struct ath_softc *sc) -@@ -980,6 +981,18 @@ static void ath9k_set_hw_capab(struct at + static const struct ieee80211_iface_limit if_limits[] = { +@@ -774,6 +775,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) { -@@ -1025,6 +1038,8 @@ int ath9k_init_device(u16 devid, struct +@@ -822,6 +835,8 @@ int ath9k_init_device(u16 devid, struct ARRAY_SIZE(ath9k_tpt_blink)); #endif @@ -110,7 +110,7 @@ static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable) --- a/drivers/net/wireless/ath/ath9k/link.c +++ b/drivers/net/wireless/ath/ath9k/link.c -@@ -307,6 +307,11 @@ void ath_ani_calibrate(unsigned long dat +@@ -308,6 +308,11 @@ void ath_ani_calibrate(unsigned long dat unsigned int timestamp = jiffies_to_msecs(jiffies); u32 cal_interval, short_cal_interval, long_cal_interval; unsigned long flags; |