Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d1b08c4 authored by Greg Price's avatar Greg Price Committed by Theodore Ts'o
Browse files

random: entropy_bytes is actually bits 



The variable 'entropy_bytes' is set from an expression that actually
counts bits.  Fortunately it's also only compared to values that also
count bits.  Rename it accordingly.

Signed-off-by: default avatarGreg Price <price@mit.edu>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 0fb7a01a

drivers/char/random.c

+3 −3
Original line number Diff line number Diff line
@@ -666,10 +666,10 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) 
				  r->entropy_total, _RET_IP_);



	if (r == &input_pool) {

		int entropy_bytes = entropy_count >> ENTROPY_SHIFT;

		int entropy_bits = entropy_count >> ENTROPY_SHIFT;



		/* should we wake readers? */

		if (entropy_bytes >= random_read_wakeup_thresh) {

		if (entropy_bits >= random_read_wakeup_thresh) {

			wake_up_interruptible(&random_read_wait);

			kill_fasync(&fasync, SIGIO, POLL_IN);

		}
@@ -678,7 +678,7 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) 
		 * forth between them, until the output pools are 75%

		 * full.

		 */

		if (entropy_bytes > random_write_wakeup_thresh &&

		if (entropy_bits > random_write_wakeup_thresh &&

		    r->initialized &&

		    r->entropy_total >= 2*random_read_wakeup_thresh) {

			static struct entropy_store *last = &blocking_pool;