Module Name: src
Committed By: matt
Date: Mon Dec 13 14:18:50 UTC 2010
Modified Files:
src/sys/netinet: ip_input.c
Log Message:
Back out rev that shouldn't have been committed.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/netinet/ip_input.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_input.c
diff -u src/sys/netinet/ip_input.c:1.292 src/sys/netinet/ip_input.c:1.293
--- src/sys/netinet/ip_input.c:1.292 Sat Dec 11 22:37:46 2010
+++ src/sys/netinet/ip_input.c Mon Dec 13 14:18:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.292 2010/12/11 22:37:46 matt Exp $ */
+/* $NetBSD: ip_input.c,v 1.293 2010/12/13 14:18:50 matt Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.292 2010/12/11 22:37:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.293 2010/12/13 14:18:50 matt Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -390,9 +390,7 @@
IF_DEQUEUE(&lcl_intrq, m);
if (m == NULL)
break;
- KERNEL_UNLOCK_ONE(NULL);
ip_input(m);
- KERNEL_LOCK(1, NULL);
}
mutex_exit(softnet_lock);
}
