Module Name: src
Committed By: riastradh
Date: Wed Feb 17 01:01:42 UTC 2016
Modified Files:
src/sys/kern: kern_rndq.c
Log Message:
Omit needless call to rnd_getmore in rnd_extract_data.
The only remaining caller -- rnd_extract -- already does it.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/kern/kern_rndq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.77 src/sys/kern/kern_rndq.c:1.78
--- src/sys/kern/kern_rndq.c:1.77 Wed Feb 17 00:57:36 2016
+++ src/sys/kern/kern_rndq.c Wed Feb 17 01:01:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.77 2016/02/17 00:57:36 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.78 2016/02/17 01:01:42 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.77 2016/02/17 00:57:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.78 2016/02/17 01:01:42 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1232,12 +1232,6 @@ rnd_extract_data(void *p, uint32_t len,
retval = rndpool_extract_data(&rnd_global.pool, p, len, flags);
mutex_spin_exit(&rnd_global.lock);
- if (entropy_count < (RND_ENTROPY_THRESHOLD * 2 + len) * NBBY) {
- rnd_printf_verbose("rnd: empty, asking for %d bytes\n",
- (int)(howmany((RND_POOLBITS - entropy_count), NBBY)));
- rnd_getmore(howmany((RND_POOLBITS - entropy_count), NBBY));
- }
-
return retval;
}
