diff options
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 | 28 |
1 files changed, 14 insertions, 14 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 d6333459b0..d49dc65887 100644 --- a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch +++ b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -676,6 +676,7 @@ struct ath_spec_scan { +@@ -682,6 +682,7 @@ struct ath_spec_scan { * @config_pci_powersave: * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC * @@ -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 -@@ -698,6 +699,7 @@ struct ath_hw_ops { +@@ -704,6 +705,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); @@ -18,8 +18,8 @@ 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 -@@ -1609,6 +1609,26 @@ static void ar9003_hw_spectral_scan_wait - } +@@ -1709,6 +1709,26 @@ static void ar9003_hw_tx99_set_txpower(s + ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14], 0)); } +static void ar9003_hw_get_adc_entropy(struct ath_hw *ah, u8 *buf, size_t len) @@ -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); -@@ -1639,6 +1659,7 @@ void ar9003_hw_attach_phy_ops(struct ath +@@ -1739,6 +1759,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; @@ -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 -@@ -794,7 +794,8 @@ static void ath9k_init_txpower_limits(st +@@ -824,7 +824,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) -@@ -940,6 +941,18 @@ void ath9k_set_hw_capab(struct ath_softc +@@ -954,6 +955,18 @@ void ath9k_set_hw_capab(struct ath_softc 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) { -@@ -985,6 +998,8 @@ int ath9k_init_device(u16 devid, struct +@@ -999,6 +1012,8 @@ int ath9k_init_device(u16 devid, struct ARRAY_SIZE(ath9k_tpt_blink)); #endif @@ -95,8 +95,8 @@ if (error) --- a/drivers/net/wireless/ath/ath9k/hw-ops.h +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h -@@ -78,6 +78,12 @@ static inline void ath9k_hw_antdiv_comb_ - ath9k_hw_ops(ah)->antdiv_comb_conf_set(ah, antconf); +@@ -94,6 +94,12 @@ static inline void ath9k_hw_tx99_set_txp + ath9k_hw_ops(ah)->tx99_set_txpower(ah, power); } +static inline void ath9k_hw_get_adc_entropy(struct ath_hw *ah, @@ -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 -@@ -342,6 +342,11 @@ void ath_ani_calibrate(unsigned long dat +@@ -354,6 +354,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; @@ -120,11 +120,11 @@ + ath9k_hw_get_adc_entropy(ah, buf, sizeof(buf)); + add_device_randomness(buf, sizeof(buf)); - if (ah->caldata && ah->caldata->nfcal_interference) + if (ah->caldata && test_bit(NFCAL_INTF, &ah->caldata->cal_flags)) long_cal_interval = ATH_LONG_CALINTERVAL_INT; --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c -@@ -1299,9 +1299,30 @@ static void ar5008_hw_set_radar_conf(str +@@ -1296,9 +1296,30 @@ static void ar5008_hw_set_radar_conf(str conf->radar_inband = 8; } @@ -155,7 +155,7 @@ static const u32 ar5416_cca_regs[6] = { AR_PHY_CCA, AR_PHY_CH1_CCA, -@@ -1316,6 +1337,8 @@ int ar5008_hw_attach_phy_ops(struct ath_ +@@ -1313,6 +1334,8 @@ int ar5008_hw_attach_phy_ops(struct ath_ if (ret) return ret; |