Module Name: src
Committed By: martin
Date: Mon Dec 1 10:35:37 UTC 2014
Modified Files:
src/sys/netinet [netbsd-7]: ip_output.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.230.2.1 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.230 src/sys/netinet/ip_output.c:1.230.2.1
--- src/sys/netinet/ip_output.c:1.230 Fri Jun 6 00:11:19 2014
+++ src/sys/netinet/ip_output.c Mon Dec 1 10:35:37 2014
@@ -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_mloopback(struct ifnet *ifp, struct m
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);
}
