Module Name: src
Committed By: maxv
Date: Thu May 3 07:13:49 UTC 2018
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_auth.c ip_fil_netbsd.c ip_frag.c
ip_log.c ip_nat.c ip_nat6.c ip_proxy.c ip_sync.c
src/sys/netinet: in_proto.c tcp_congctl.c tcp_debug.c tcp_input.c
tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c tcp_usrreq.c
tcp_vtw.c
src/sys/netinet6: in6_proto.c
src/usr.bin/netstat: inet.c inet6.c vtw.c
src/usr.bin/systat: netstat.c
src/usr.sbin/trpt: trpt.c
Log Message:
Remove now unused tcpip.h includes. Some were already unused before.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/ipf/netinet/ip_auth.c \
src/sys/external/bsd/ipf/netinet/ip_frag.c \
src/sys/external/bsd/ipf/netinet/ip_proxy.c \
src/sys/external/bsd/ipf/netinet/ip_sync.c
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_log.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/ipf/netinet/ip_nat.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/ipf/netinet/ip_nat6.c
cvs rdiff -u -r1.127 -r1.128 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netinet/tcp_congctl.c
cvs rdiff -u -r1.31 -r1.32 src/sys/netinet/tcp_debug.c
cvs rdiff -u -r1.406 -r1.407 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.205 -r1.206 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.278 -r1.279 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.94 -r1.95 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.218 -r1.219 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.123 -r1.124 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/netstat/inet.c
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/netstat/inet6.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/netstat/vtw.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/systat/netstat.c
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/trpt/trpt.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/external/bsd/ipf/netinet/ip_auth.c
diff -u src/sys/external/bsd/ipf/netinet/ip_auth.c:1.5 src/sys/external/bsd/ipf/netinet/ip_auth.c:1.6
--- src/sys/external/bsd/ipf/netinet/ip_auth.c:1.5 Fri May 30 02:16:17 2014
+++ src/sys/external/bsd/ipf/netinet/ip_auth.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_auth.c,v 1.5 2014/05/30 02:16:17 rmind Exp $ */
+/* $NetBSD: ip_auth.c,v 1.6 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -111,7 +111,6 @@ extern struct ifqueue ipintrq; /* ip
#include <netinet/udp.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_auth.h"
#if !defined(MENTAT) && !defined(linux)
@@ -131,7 +130,7 @@ extern struct ifqueue ipintrq; /* ip
#if !defined(lint)
#if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.5 2014/05/30 02:16:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_auth.c,v 1.6 2018/05/03 07:13:48 maxv Exp $");
#else
static const char rcsid[] = "@(#)Id: ip_auth.c,v 1.1.1.2 2012/07/22 13:45:08 darrenr Exp";
#endif
Index: src/sys/external/bsd/ipf/netinet/ip_frag.c
diff -u src/sys/external/bsd/ipf/netinet/ip_frag.c:1.5 src/sys/external/bsd/ipf/netinet/ip_frag.c:1.6
--- src/sys/external/bsd/ipf/netinet/ip_frag.c:1.5 Sun Apr 23 19:09:29 2017
+++ src/sys/external/bsd/ipf/netinet/ip_frag.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_frag.c,v 1.5 2017/04/23 19:09:29 christos Exp $ */
+/* $NetBSD: ip_frag.c,v 1.6 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -73,7 +73,6 @@ struct file;
#include <netinet/udp.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
#include "netinet/ip_frag.h"
@@ -87,7 +86,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.5 2017/04/23 19:09:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_frag.c,v 1.6 2018/05/03 07:13:48 maxv Exp $");
#else
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_frag.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
Index: src/sys/external/bsd/ipf/netinet/ip_proxy.c
diff -u src/sys/external/bsd/ipf/netinet/ip_proxy.c:1.5 src/sys/external/bsd/ipf/netinet/ip_proxy.c:1.6
--- src/sys/external/bsd/ipf/netinet/ip_proxy.c:1.5 Sun Jul 22 16:34:04 2012
+++ src/sys/external/bsd/ipf/netinet/ip_proxy.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_proxy.c,v 1.5 2012/07/22 16:34:04 darrenr Exp $ */
+/* $NetBSD: ip_proxy.c,v 1.6 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -77,7 +77,6 @@ struct file;
#include <netinet/udp.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
#include "netinet/ip_state.h"
@@ -104,7 +103,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_proxy.c,v 1.5 2012/07/22 16:34:04 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_proxy.c,v 1.6 2018/05/03 07:13:48 maxv Exp $");
#else
static const char rcsid[] = "@(#)Id: ip_proxy.c,v 1.1.1.2 2012/07/22 13:45:33 darrenr Exp";
#endif
Index: src/sys/external/bsd/ipf/netinet/ip_sync.c
diff -u src/sys/external/bsd/ipf/netinet/ip_sync.c:1.5 src/sys/external/bsd/ipf/netinet/ip_sync.c:1.6
--- src/sys/external/bsd/ipf/netinet/ip_sync.c:1.5 Sat Sep 14 12:18:06 2013
+++ src/sys/external/bsd/ipf/netinet/ip_sync.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_sync.c,v 1.5 2013/09/14 12:18:06 martin Exp $ */
+/* $NetBSD: ip_sync.c,v 1.6 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -78,7 +78,6 @@ struct file;
#include <netinet/udp.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
#include "netinet/ip_frag.h"
@@ -100,7 +99,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_sync.c,v 1.5 2013/09/14 12:18:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_sync.c,v 1.6 2018/05/03 07:13:48 maxv Exp $");
#else
static const char rcsid[] = "@(#)Id: ip_sync.c,v 1.1.1.2 2012/07/22 13:45:38 darrenr Exp";
#endif
Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.27 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.28
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.27 Thu May 3 07:01:08 2018
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.27 2018/05/03 07:01:08 maxv Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.28 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.27 2018/05/03 07:01:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.28 2018/05/03 07:13:48 maxv Exp $");
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -71,7 +71,6 @@ static const char rcsid[] = "@(#)Id: ip_
# include <netinet/tcp_var.h>
#endif
#include <netinet/udp.h>
-#include <netinet/tcpip.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
#ifdef USE_INET6
Index: src/sys/external/bsd/ipf/netinet/ip_log.c
diff -u src/sys/external/bsd/ipf/netinet/ip_log.c:1.6 src/sys/external/bsd/ipf/netinet/ip_log.c:1.7
--- src/sys/external/bsd/ipf/netinet/ip_log.c:1.6 Thu Mar 28 20:14:18 2013
+++ src/sys/external/bsd/ipf/netinet/ip_log.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_log.c,v 1.6 2013/03/28 20:14:18 christos Exp $ */
+/* $NetBSD: ip_log.c,v 1.7 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.6 2013/03/28 20:14:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_log.c,v 1.7 2018/05/03 07:13:48 maxv Exp $");
#include <sys/param.h>
#if defined(KERNEL) || defined(_KERNEL)
@@ -123,7 +123,6 @@ struct file;
# include <syslog.h>
#endif
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
#include "netinet/ip_frag.h"
Index: src/sys/external/bsd/ipf/netinet/ip_nat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.18 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.19
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.18 Sat Jul 1 16:34:17 2017
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.c,v 1.18 2017/07/01 16:34:17 khorben Exp $ */
+/* $NetBSD: ip_nat.c,v 1.19 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -87,7 +87,6 @@ extern struct ifnet vpnif;
#include <netinet/udp.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ipl.h"
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
@@ -113,7 +112,7 @@ extern struct ifnet vpnif;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.18 2017/07/01 16:34:17 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.19 2018/05/03 07:13:48 maxv Exp $");
#else
static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp";
Index: src/sys/external/bsd/ipf/netinet/ip_nat6.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.10 src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.11
--- src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.10 Tue Oct 4 14:36:46 2016
+++ src/sys/external/bsd/ipf/netinet/ip_nat6.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat6.c,v 1.10 2016/10/04 14:36:46 sborrill Exp $ */
+/* $NetBSD: ip_nat6.c,v 1.11 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -87,7 +87,6 @@ extern struct ifnet vpnif;
#include <netinet/udp.h>
#include <netinet/ip_icmp.h>
#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
#include "netinet/ip_frag.h"
Index: src/sys/netinet/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.127 src/sys/netinet/in_proto.c:1.128
--- src/sys/netinet/in_proto.c:1.127 Thu Mar 15 08:15:21 2018
+++ src/sys/netinet/in_proto.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_proto.c,v 1.127 2018/03/15 08:15:21 maxv Exp $ */
+/* $NetBSD: in_proto.c,v 1.128 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.127 2018/03/15 08:15:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.128 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -109,7 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
#include <netinet/udp.h>
#include <netinet/udp_var.h>
Index: src/sys/netinet/tcp_congctl.c
diff -u src/sys/netinet/tcp_congctl.c:1.24 src/sys/netinet/tcp_congctl.c:1.25
--- src/sys/netinet/tcp_congctl.c:1.24 Thu Mar 29 07:46:43 2018
+++ src/sys/netinet/tcp_congctl.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_congctl.c,v 1.24 2018/03/29 07:46:43 maxv Exp $ */
+/* $NetBSD: tcp_congctl.c,v 1.25 2018/05/03 07:13:48 maxv 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.24 2018/03/29 07:46:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.25 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -180,7 +180,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_congctl.
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_congctl.h>
#ifdef TCP_DEBUG
#include <netinet/tcp_debug.h>
Index: src/sys/netinet/tcp_debug.c
diff -u src/sys/netinet/tcp_debug.c:1.31 src/sys/netinet/tcp_debug.c:1.32
--- src/sys/netinet/tcp_debug.c:1.31 Thu Mar 29 07:46:43 2018
+++ src/sys/netinet/tcp_debug.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_debug.c,v 1.31 2018/03/29 07:46:43 maxv Exp $ */
+/* $NetBSD: tcp_debug.c,v 1.32 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,v 1.31 2018/03/29 07:46:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,v 1.32 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -99,7 +99,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_debug.c,
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
struct tcp_debug tcp_debug[TCP_NDEBUG];
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.406 src/sys/netinet/tcp_input.c:1.407
--- src/sys/netinet/tcp_input.c:1.406 Sat Apr 28 13:26:57 2018
+++ src/sys/netinet/tcp_input.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.406 2018/04/28 13:26:57 maxv Exp $ */
+/* $NetBSD: tcp_input.c,v 1.407 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.406 2018/04/28 13:26:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.407 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -210,7 +210,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_input.c,
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/tcp_private.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_congctl.h>
#include <netinet/tcp_debug.h>
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.205 src/sys/netinet/tcp_output.c:1.206
--- src/sys/netinet/tcp_output.c:1.205 Tue Apr 3 08:02:34 2018
+++ src/sys/netinet/tcp_output.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.205 2018/04/03 08:02:34 maxv Exp $ */
+/* $NetBSD: tcp_output.c,v 1.206 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.205 2018/04/03 08:02:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.206 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -189,7 +189,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_output.c
#include <netinet/tcp_var.h>
#include <netinet/tcp_private.h>
#include <netinet/tcp_congctl.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
#include <netinet/in_offload.h>
#include <netinet6/in6_offload.h>
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.34 src/sys/netinet/tcp_sack.c:1.35
--- src/sys/netinet/tcp_sack.c:1.34 Thu Mar 29 07:46:43 2018
+++ src/sys/netinet/tcp_sack.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.34 2018/03/29 07:46:43 maxv Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.35 2018/05/03 07:13:48 maxv 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.34 2018/03/29 07:46:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.35 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -153,7 +153,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
/* SACK block pool. */
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.278 src/sys/netinet/tcp_subr.c:1.279
--- src/sys/netinet/tcp_subr.c:1.278 Wed Apr 18 07:17:49 2018
+++ src/sys/netinet/tcp_subr.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.278 2018/04/18 07:17:49 maxv Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.279 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.278 2018/04/18 07:17:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.279 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -143,7 +143,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v
#include <netinet/tcp_vtw.h>
#include <netinet/tcp_private.h>
#include <netinet/tcp_congctl.h>
-#include <netinet/tcpip.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>
Index: src/sys/netinet/tcp_timer.c
diff -u src/sys/netinet/tcp_timer.c:1.94 src/sys/netinet/tcp_timer.c:1.95
--- src/sys/netinet/tcp_timer.c:1.94 Thu Mar 29 07:46:43 2018
+++ src/sys/netinet/tcp_timer.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.94 2018/03/29 07:46:43 maxv Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.95 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.94 2018/03/29 07:46:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.95 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -133,7 +133,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,
#include <netinet/tcp_var.h>
#include <netinet/tcp_private.h>
#include <netinet/tcp_congctl.h>
-#include <netinet/tcpip.h>
#ifdef TCP_DEBUG
#include <netinet/tcp_debug.h>
#endif
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.218 src/sys/netinet/tcp_usrreq.c:1.219
--- src/sys/netinet/tcp_usrreq.c:1.218 Sat Apr 7 13:48:50 2018
+++ src/sys/netinet/tcp_usrreq.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.218 2018/04/07 13:48:50 maxv Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.219 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.218 2018/04/07 13:48:50 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.219 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -149,7 +149,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c
#include <netinet/tcp_var.h>
#include <netinet/tcp_private.h>
#include <netinet/tcp_congctl.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
#include <netinet/tcp_vtw.h>
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.18 src/sys/netinet/tcp_vtw.c:1.19
--- src/sys/netinet/tcp_vtw.c:1.18 Thu Jun 1 02:45:14 2017
+++ src/sys/netinet/tcp_vtw.c Thu May 3 07:13:48 2018
@@ -118,11 +118,10 @@
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/tcp_private.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_vtw.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.18 2017/06/01 02:45:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.19 2018/05/03 07:13:48 maxv Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.123 src/sys/netinet6/in6_proto.c:1.124
--- src/sys/netinet6/in6_proto.c:1.123 Thu May 3 06:41:30 2018
+++ src/sys/netinet6/in6_proto.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.123 2018/05/03 06:41:30 maxv Exp $ */
+/* $NetBSD: in6_proto.c,v 1.124 2018/05/03 07:13:48 maxv 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.123 2018/05/03 06:41:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.124 2018/05/03 07:13:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -99,7 +99,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c,
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
#include <netinet6/udp6.h>
Index: src/usr.bin/netstat/inet.c
diff -u src/usr.bin/netstat/inet.c:1.107 src/usr.bin/netstat/inet.c:1.108
--- src/usr.bin/netstat/inet.c:1.107 Fri Dec 23 06:22:00 2016
+++ src/usr.bin/netstat/inet.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.107 2016/12/23 06:22:00 mrg Exp $ */
+/* $NetBSD: inet.c,v 1.108 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet.c,v 1.107 2016/12/23 06:22:00 mrg Exp $");
+__RCSID("$NetBSD: inet.c,v 1.108 2018/05/03 07:13:48 maxv Exp $");
#endif
#endif /* not lint */
@@ -66,7 +66,6 @@ __RCSID("$NetBSD: inet.c,v 1.107 2016/12
#include <netinet/ip_var.h>
#include <netinet/pim_var.h>
#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_seq.h>
#define TCPSTATES
#include <netinet/tcp_fsm.h>
Index: src/usr.bin/netstat/inet6.c
diff -u src/usr.bin/netstat/inet6.c:1.70 src/usr.bin/netstat/inet6.c:1.71
--- src/usr.bin/netstat/inet6.c:1.70 Tue Dec 19 17:05:15 2017
+++ src/usr.bin/netstat/inet6.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: inet6.c,v 1.70 2017/12/19 17:05:15 kre Exp $ */
+/* $NetBSD: inet6.c,v 1.71 2018/05/03 07:13:48 maxv Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*
@@ -64,7 +64,7 @@
#if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet6.c,v 1.70 2017/12/19 17:05:15 kre Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.71 2018/05/03 07:13:48 maxv Exp $");
#endif
#endif /* not lint */
@@ -107,7 +107,6 @@ __RCSID("$NetBSD: inet6.c,v 1.70 2017/12
#define TCP6_NSTATES TCP_NSTATES
#define tcp6cb tcpcb
#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_seq.h>
#include <netinet/tcp_fsm.h>
extern const char * const tcpstates[];
Index: src/usr.bin/netstat/vtw.c
diff -u src/usr.bin/netstat/vtw.c:1.9 src/usr.bin/netstat/vtw.c:1.10
--- src/usr.bin/netstat/vtw.c:1.9 Mon Feb 29 18:19:46 2016
+++ src/usr.bin/netstat/vtw.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vtw.c,v 1.9 2016/02/29 18:19:46 christos Exp $ */
+/* $NetBSD: vtw.c,v 1.10 2018/05/03 07:13:48 maxv Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: vtw.c,v 1.9 2016/02/29 18:19:46 christos Exp $");
+__RCSID("$NetBSD: vtw.c,v 1.10 2018/05/03 07:13:48 maxv Exp $");
#endif
#endif /* not lint */
@@ -93,7 +93,6 @@ __RCSID("$NetBSD: vtw.c,v 1.9 2016/02/29
#include <netinet/ip_var.h>
#include <netinet/pim_var.h>
#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_seq.h>
#include <netinet/tcp_fsm.h>
#include <netinet/tcp_timer.h>
Index: src/usr.bin/systat/netstat.c
diff -u src/usr.bin/systat/netstat.c:1.29 src/usr.bin/systat/netstat.c:1.30
--- src/usr.bin/systat/netstat.c:1.29 Sun Nov 24 13:13:12 2013
+++ src/usr.bin/systat/netstat.c Thu May 3 07:13:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.c,v 1.29 2013/11/24 13:13:12 mlelstv Exp $ */
+/* $NetBSD: netstat.c,v 1.30 2018/05/03 07:13:48 maxv Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netstat.c,v 1.29 2013/11/24 13:13:12 mlelstv Exp $");
+__RCSID("$NetBSD: netstat.c,v 1.30 2018/05/03 07:13:48 maxv Exp $");
#endif /* not lint */
/*
@@ -61,7 +61,6 @@ __RCSID("$NetBSD: netstat.c,v 1.29 2013/
#include <netinet6/in6_pcb.h>
#endif
#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_seq.h>
#define TCPSTATES
#include <netinet/tcp_fsm.h>
Index: src/usr.sbin/trpt/trpt.c
diff -u src/usr.sbin/trpt/trpt.c:1.27 src/usr.sbin/trpt/trpt.c:1.28
--- src/usr.sbin/trpt/trpt.c:1.27 Tue Aug 30 20:49:29 2011
+++ src/usr.sbin/trpt/trpt.c Thu May 3 07:13:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trpt.c,v 1.27 2011/08/30 20:49:29 joerg Exp $ */
+/* $NetBSD: trpt.c,v 1.28 2018/05/03 07:13:49 maxv Exp $ */
/*-
* Copyright (c) 1997, 2005, 2006 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: trpt.c,v 1.27 2011/08/30 20:49:29 joerg Exp $");
+__RCSID("$NetBSD: trpt.c,v 1.28 2018/05/03 07:13:49 maxv Exp $");
#endif
#endif /* not lint */
@@ -107,7 +107,6 @@ __RCSID("$NetBSD: trpt.c,v 1.27 2011/08/
#define TCPTIMERS
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#define TANAMES
#include <netinet/tcp_debug.h>
