Module Name: src
Committed By: maxv
Date: Fri Nov 14 17:34:23 UTC 2014
Modified Files:
src/sys/netinet6: dest6.c in6_ifattach.c in6_pcb.c ip6_forward.c
udp6_output.c
Log Message:
Do not uselessly include <sys/malloc.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet6/dest6.c
cvs rdiff -u -r1.93 -r1.94 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.131 -r1.132 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.73 -r1.74 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netinet6/udp6_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/netinet6/dest6.c
diff -u src/sys/netinet6/dest6.c:1.17 src/sys/netinet6/dest6.c:1.18
--- src/sys/netinet6/dest6.c:1.17 Tue Apr 15 03:57:04 2008
+++ src/sys/netinet6/dest6.c Fri Nov 14 17:34:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dest6.c,v 1.17 2008/04/15 03:57:04 thorpej Exp $ */
+/* $NetBSD: dest6.c,v 1.18 2014/11/14 17:34:23 maxv Exp $ */
/* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */
/*
@@ -31,11 +31,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.17 2008/04/15 03:57:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.18 2014/11/14 17:34:23 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.93 src/sys/netinet6/in6_ifattach.c:1.94
--- src/sys/netinet6/in6_ifattach.c:1.93 Tue Sep 9 20:16:12 2014
+++ src/sys/netinet6/in6_ifattach.c Fri Nov 14 17:34:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.93 2014/09/09 20:16:12 rmind Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.94 2014/11/14 17:34:23 maxv Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,12 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.93 2014/09/09 20:16:12 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.94 2014/11/14 17:34:23 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kmem.h>
-#include <sys/malloc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.131 src/sys/netinet6/in6_pcb.c:1.132
--- src/sys/netinet6/in6_pcb.c:1.131 Sat Oct 11 23:07:39 2014
+++ src/sys/netinet6/in6_pcb.c Fri Nov 14 17:34:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.131 2014/10/11 23:07:39 christos Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.132 2014/11/14 17:34:23 maxv Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,14 +62,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.131 2014/10/11 23:07:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.132 2014/11/14 17:34:23 maxv Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.73 src/sys/netinet6/ip6_forward.c:1.74
--- src/sys/netinet6/ip6_forward.c:1.73 Fri May 30 01:39:03 2014
+++ src/sys/netinet6/ip6_forward.c Fri Nov 14 17:34:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.73 2014/05/30 01:39:03 christos Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.74 2014/11/14 17:34:23 maxv Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,14 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.73 2014/05/30 01:39:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.74 2014/11/14 17:34:23 maxv Exp $");
#include "opt_gateway.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
Index: src/sys/netinet6/udp6_output.c
diff -u src/sys/netinet6/udp6_output.c:1.45 src/sys/netinet6/udp6_output.c:1.46
--- src/sys/netinet6/udp6_output.c:1.45 Sat Oct 11 20:53:16 2014
+++ src/sys/netinet6/udp6_output.c Fri Nov 14 17:34:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_output.c,v 1.45 2014/10/11 20:53:16 christos Exp $ */
+/* $NetBSD: udp6_output.c,v 1.46 2014/11/14 17:34:23 maxv Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
/*
@@ -62,12 +62,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.45 2014/10/11 20:53:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.46 2014/11/14 17:34:23 maxv Exp $");
#include "opt_inet.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
