diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-27 20:26:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 20:26:59 -0500 |
| commit | 33f8a0458b2ce4546b681c5fae04427e3077a543 (patch) | |
| tree | dc7e9750666fa02b19e0dad4aa8b514403f5e4ae /drivers/net/wireless/ath/ath9k/rng.c | |
| parent | 5a717f4f8f2830f297b5511022481bdc27b9d576 (diff) | |
| parent | 159a55a64d44acbbd6f0d8f3c082e628d6d75670 (diff) | |
Merge tag 'wireless-drivers-next-for-davem-2016-11-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.10
Major changes:
iwlwifi
* finalize and enable dynamic queue allocation
* use dev_coredumpmsg() to prevent locking the driver
* small fix to pass the AID to the FW
* use FW PS decisions with multi-queue
ath9k
* add device tree bindings
* switch to use mac80211 intermediate software queues to reduce
latency and fix bufferbloat
wl18xx
* allow scanning in AP mode
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/rng.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/rng.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rng.c b/drivers/net/wireless/ath/ath9k/rng.c index d38e50f96db7..568b1c6c2b2b 100644 --- a/drivers/net/wireless/ath/ath9k/rng.c +++ b/drivers/net/wireless/ath/ath9k/rng.c @@ -22,7 +22,7 @@ #include "ar9003_phy.h" #define ATH9K_RNG_BUF_SIZE 320 -#define ATH9K_RNG_ENTROPY(x) (((x) * 8 * 320) >> 10) /* quality: 320/1024 */ +#define ATH9K_RNG_ENTROPY(x) (((x) * 8 * 10) >> 5) /* quality: 10/32 */ static int ath9k_rng_data_read(struct ath_softc *sc, u32 *buf, u32 buf_size) { |