[src/netbsd-6]: src/sys Pull up following revision(s) (requested by msaitoh i...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08c7327f6aa2
branches:  netbsd-6
changeset: 775425:08c7327f6aa2
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Oct 31 17:30:20 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #644):
        sys/netinet/tcp_subr.c: revision 1.248
        sys/kern/subr_cprng.c: revision 1.12
Fix a bug that kmem_alloc() is called from the interrupt context.

diffstat:

 sys/kern/subr_cprng.c  |  7 ++++---
 sys/netinet/tcp_subr.c |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r f0bb5db9c5b2 -r 08c7327f6aa2 sys/kern/subr_cprng.c
--- a/sys/kern/subr_cprng.c     Wed Oct 31 17:27:27 2012 +0000
+++ b/sys/kern/subr_cprng.c     Wed Oct 31 17:30:20 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_cprng.c,v 1.5.2.4 2012/10/17 21:27:12 riz Exp $ */
+/*     $NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 
 #include <sys/cprng.h>
 
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.5.2.4 2012/10/17 21:27:12 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz Exp $");
 
 void
 cprng_init(void)
@@ -284,7 +284,8 @@
         * If the generator has just been keyed, perform
         * the statistical RNG test.
         */
-       if (__predict_false(c->drbg.reseed_counter == 1)) {
+       if (__predict_false(c->drbg.reseed_counter == 1) &&
+           (flags & FASYNC) == 0) {
                rngtest_t *rt = kmem_alloc(sizeof(*rt), KM_NOSLEEP);
 
                if (rt) {
diff -r f0bb5db9c5b2 -r 08c7327f6aa2 sys/netinet/tcp_subr.c
--- a/sys/netinet/tcp_subr.c    Wed Oct 31 17:27:27 2012 +0000
+++ b/sys/netinet/tcp_subr.c    Wed Oct 31 17:30:20 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $  */
+/*     $NetBSD: tcp_subr.c,v 1.246.2.1 2012/10/31 17:30:20 riz Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.246.2.1 2012/10/31 17:30:20 riz Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -2219,7 +2219,7 @@
         */
        if (tcp_iss_gotten_secret == false) {
                cprng_strong(kern_cprng,
-                            tcp_iss_secret, sizeof(tcp_iss_secret), 0);
+                            tcp_iss_secret, sizeof(tcp_iss_secret), FASYNC);
                tcp_iss_gotten_secret = true;
        }