[src/netbsd-7]: src/sys/netinet Pull up following revision(s) (requested by o...

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

details:   https://anonhg.NetBSD.org/src/rev/9930119ca3d3
branches:  netbsd-7
changeset: 798642:9930119ca3d3
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 01 10:35:37 2014 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #277):
        sys/netinet/ip_output.c: revision 1.233
Call looutput with holding KERNEL_LOCK
This fixes diagnostic assertion "KERNEL_LOCKED_P()" in if_loop.c.
PR kern/49410

diffstat:

 sys/netinet/ip_output.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r e0ada40b0379 -r 9930119ca3d3 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Mon Dec 01 09:54:50 2014 +0000
+++ b/sys/netinet/ip_output.c   Mon Dec 01 10:35:37 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.230 2014/06/06 00:11:19 rmind Exp $    */
+/*     $NetBSD: ip_output.c,v 1.230.2.1 2014/12/01 10:35:37 martin Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.230 2014/06/06 00:11:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.230.2.1 2014/12/01 10:35:37 martin Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1683,5 +1683,7 @@
 
        ip->ip_sum = 0;
        ip->ip_sum = in_cksum(copym, ip->ip_hl << 2);
+       KERNEL_LOCK(1, NULL);
        (void)looutput(ifp, copym, sintocsa(dst), NULL);
+       KERNEL_UNLOCK_ONE(NULL);
 }