Module Name: src
Committed By: ozaki-r
Date: Tue Dec 13 08:29:03 UTC 2016
Modified Files:
src/sys/netinet: dccp_usrreq.c sctp_asconf.c tcp_congctl.c tcp_sack.c
tcp_vtw.c tcp_vtw.h
src/sys/netinet6: dccp6_usrreq.c in6_pcb.c in6_proto.c raw_ip6.c
sctp6_usrreq.c
Log Message:
Remove unnecessary inclusions of nd6.h
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet/dccp_usrreq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.21 -r1.22 src/sys/netinet/tcp_congctl.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/tcp_vtw.h
cvs rdiff -u -r1.9 -r1.10 src/sys/netinet6/dccp6_usrreq.c
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.113 -r1.114 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet6/sctp6_usrreq.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/dccp_usrreq.c
diff -u src/sys/netinet/dccp_usrreq.c:1.9 src/sys/netinet/dccp_usrreq.c:1.10
--- src/sys/netinet/dccp_usrreq.c:1.9 Thu Jul 7 06:55:43 2016
+++ src/sys/netinet/dccp_usrreq.c Tue Dec 13 08:29:03 2016
@@ -1,5 +1,5 @@
/* $KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $ */
-/* $NetBSD: dccp_usrreq.c,v 1.9 2016/07/07 06:55:43 msaitoh Exp $ */
+/* $NetBSD: dccp_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $ */
/*
* Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.9 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -108,7 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.
#ifdef INET6
#include <netinet6/in6_pcb.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/nd6.h>
#include <netinet6/dccp6_var.h>
#endif
#include <netinet/dccp.h>
Index: src/sys/netinet/sctp_asconf.c
diff -u src/sys/netinet/sctp_asconf.c:1.5 src/sys/netinet/sctp_asconf.c:1.6
--- src/sys/netinet/sctp_asconf.c:1.5 Thu Jul 7 09:32:02 2016
+++ src/sys/netinet/sctp_asconf.c Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_asconf.c,v 1.5 2016/07/07 09:32:02 ozaki-r Exp $ */
+/* $NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $ */
/* $KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.5 2016/07/07 09:32:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_asconf.
#include <netinet6/ip6_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
#include <netinet6/scope6_var.h>
#endif /* INET6 */
Index: src/sys/netinet/tcp_congctl.c
diff -u src/sys/netinet/tcp_congctl.c:1.21 src/sys/netinet/tcp_congctl.c:1.22
--- src/sys/netinet/tcp_congctl.c:1.21 Tue Apr 26 08:44:44 2016
+++ src/sys/netinet/tcp_congctl.c Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $ */
+/* $NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.21 2016/04/26 08:44:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -176,7 +176,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_congctl.
#include <netinet6/ip6_var.h>
#include <netinet6/in6_var.h>
#include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
#endif
#include <netinet/tcp.h>
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.32 src/sys/netinet/tcp_sack.c:1.33
--- src/sys/netinet/tcp_sack.c:1.32 Mon Aug 24 22:21:26 2015
+++ src/sys/netinet/tcp_sack.c Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.33 2016/12/13 08:29:03 ozaki-r Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.32 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.33 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -144,7 +144,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
#include <netinet6/ip6_var.h>
#include <netinet6/in6_var.h>
#include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
#endif
#ifndef INET6
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.16 src/sys/netinet/tcp_vtw.c:1.17
--- src/sys/netinet/tcp_vtw.c:1.16 Thu Jul 28 07:54:31 2016
+++ src/sys/netinet/tcp_vtw.c Tue Dec 13 08:29:03 2016
@@ -111,7 +111,6 @@
#include <netinet6/ip6_var.h>
#include <netinet6/in6_var.h>
#include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
#include <netinet/tcp.h>
#include <netinet/tcp_fsm.h>
@@ -123,7 +122,7 @@
#include <netinet/tcp_vtw.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.16 2016/07/28 07:54:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.17 2016/12/13 08:29:03 ozaki-r Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
Index: src/sys/netinet/tcp_vtw.h
diff -u src/sys/netinet/tcp_vtw.h:1.7 src/sys/netinet/tcp_vtw.h:1.8
--- src/sys/netinet/tcp_vtw.h:1.7 Tue Apr 26 08:44:45 2016
+++ src/sys/netinet/tcp_vtw.h Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_vtw.h,v 1.7 2016/04/26 08:44:45 ozaki-r Exp $ */
+/* $NetBSD: tcp_vtw.h,v 1.8 2016/12/13 08:29:03 ozaki-r Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -143,7 +143,6 @@
#include <netinet6/ip6_var.h>
#include <netinet6/in6_var.h>
#include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
#define VTW_NCLASS (1+3) /* # different classes */
Index: src/sys/netinet6/dccp6_usrreq.c
diff -u src/sys/netinet6/dccp6_usrreq.c:1.9 src/sys/netinet6/dccp6_usrreq.c:1.10
--- src/sys/netinet6/dccp6_usrreq.c:1.9 Fri Nov 18 06:50:04 2016
+++ src/sys/netinet6/dccp6_usrreq.c Tue Dec 13 08:29:03 2016
@@ -1,5 +1,5 @@
/* $KAME: dccp6_usrreq.c,v 1.13 2005/07/27 08:42:56 nishida Exp $ */
-/* $NetBSD: dccp6_usrreq.c,v 1.9 2016/11/18 06:50:04 knakahara Exp $ */
+/* $NetBSD: dccp6_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $ */
/*
* Copyright (C) 2003 WIDE Project.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.9 2016/11/18 06:50:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq.c,v 1.10 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: dccp6_usrreq
#include <netinet/ip_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/nd6.h>
#include <netinet/dccp.h>
#include <netinet/dccp_var.h>
#include <netinet6/dccp6_var.h>
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.154 src/sys/netinet6/in6_pcb.c:1.155
--- src/sys/netinet6/in6_pcb.c:1.154 Mon Dec 12 03:55:57 2016
+++ src/sys/netinet6/in6_pcb.c Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.154 2016/12/12 03:55:57 ozaki-r Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.155 2016/12/13 08:29:03 ozaki-r Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.154 2016/12/12 03:55:57 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.155 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -96,7 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v
#include <netinet6/ip6_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/scope6_var.h>
-#include <netinet6/nd6.h>
#include "faith.h"
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.113 src/sys/netinet6/in6_proto.c:1.114
--- src/sys/netinet6/in6_proto.c:1.113 Wed Jul 6 10:49:49 2016
+++ src/sys/netinet6/in6_proto.c Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.113 2016/07/06 10:49:49 ozaki-r Exp $ */
+/* $NetBSD: in6_proto.c,v 1.114 2016/12/13 08:29:03 ozaki-r Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.113 2016/07/06 10:49:49 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.114 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -119,8 +119,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c,
#include <netinet6/pim6_var.h>
-#include <netinet6/nd6.h>
-
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec6.h>
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.153 src/sys/netinet6/raw_ip6.c:1.154
--- src/sys/netinet6/raw_ip6.c:1.153 Fri Nov 18 06:50:04 2016
+++ src/sys/netinet6/raw_ip6.c Tue Dec 13 08:29:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.153 2016/11/18 06:50:04 knakahara Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.154 2016/12/13 08:29:03 ozaki-r Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.153 2016/11/18 06:50:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.154 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -93,7 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v
#include <netinet/icmp6.h>
#include <netinet6/icmp6_private.h>
#include <netinet6/in6_pcb.h>
-#include <netinet6/nd6.h>
#include <netinet6/ip6protosw.h>
#include <netinet6/scope6_var.h>
#include <netinet6/raw_ip6.h>
Index: src/sys/netinet6/sctp6_usrreq.c
diff -u src/sys/netinet6/sctp6_usrreq.c:1.10 src/sys/netinet6/sctp6_usrreq.c:1.11
--- src/sys/netinet6/sctp6_usrreq.c:1.10 Tue Dec 6 08:58:16 2016
+++ src/sys/netinet6/sctp6_usrreq.c Tue Dec 13 08:29:03 2016
@@ -1,5 +1,5 @@
/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.10 2016/12/06 08:58:16 knakahara Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.11 2016/12/13 08:29:03 ozaki-r Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.10 2016/12/06 08:58:16 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.11 2016/12/13 08:29:03 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -79,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq
#include <netinet/icmp6.h>
#include <netinet6/sctp6_var.h>
#include <netinet6/ip6protosw.h>
-#include <netinet6/nd6.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>
