Module Name: src
Committed By: maxv
Date: Wed Feb 28 11:23:24 UTC 2018
Modified Files:
src/sys/netinet: raw_ip.c tcp_input.c udp_usrreq.c
src/sys/netinet6: icmp6.c raw_ip6.c udp6_usrreq.c
Log Message:
Remove unused ipsec_private.h includes.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.381 -r1.382 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.244 -r1.245 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.222 -r1.223 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.164 -r1.165 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.136 -r1.137 src/sys/netinet6/udp6_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/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.170 src/sys/netinet/raw_ip.c:1.171
--- src/sys/netinet/raw_ip.c:1.170 Wed Feb 28 11:10:22 2018
+++ src/sys/netinet/raw_ip.c Wed Feb 28 11:23:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.170 2018/02/28 11:10:22 maxv Exp $ */
+/* $NetBSD: raw_ip.c,v 1.171 2018/02/28 11:23:24 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.170 2018/02/28 11:10:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.171 2018/02/28 11:23:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -101,8 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/ipsec_private.h>
-#endif /* IPSEC */
+#endif
struct inpcbtable rawcbtable;
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.381 src/sys/netinet/tcp_input.c:1.382
--- src/sys/netinet/tcp_input.c:1.381 Wed Feb 28 11:09:03 2018
+++ src/sys/netinet/tcp_input.c Wed Feb 28 11:23:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.381 2018/02/28 11:09:03 maxv Exp $ */
+/* $NetBSD: tcp_input.c,v 1.382 2018/02/28 11:23:24 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.381 2018/02/28 11:09:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.382 2018/02/28 11:23:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -227,7 +227,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_input.c,
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/ipsec_private.h>
#include <netipsec/key.h>
#ifdef INET6
#include <netipsec/ipsec6.h>
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.244 src/sys/netinet/udp_usrreq.c:1.245
--- src/sys/netinet/udp_usrreq.c:1.244 Wed Feb 28 11:09:03 2018
+++ src/sys/netinet/udp_usrreq.c Wed Feb 28 11:23:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.244 2018/02/28 11:09:03 maxv Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.245 2018/02/28 11:23:24 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.244 2018/02/28 11:09:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.245 2018/02/28 11:23:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -119,7 +119,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/ipsec_private.h>
#include <netipsec/esp.h>
#ifdef INET6
#include <netipsec/ipsec6.h>
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.222 src/sys/netinet6/icmp6.c:1.223
--- src/sys/netinet6/icmp6.c:1.222 Mon Feb 26 09:13:00 2018
+++ src/sys/netinet6/icmp6.c Wed Feb 28 11:23:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.222 2018/02/26 09:13:00 maxv Exp $ */
+/* $NetBSD: icmp6.c,v 1.223 2018/02/28 11:23:24 maxv Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.222 2018/02/26 09:13:00 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.223 2018/02/28 11:23:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -105,12 +105,10 @@ __KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/ipsec_private.h>
#include <netipsec/ipsec6.h>
#include <netipsec/key.h>
#endif
-
#include "faith.h"
#if defined(NFAITH) && 0 < NFAITH
#include <net/if_faith.h>
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.164 src/sys/netinet6/raw_ip6.c:1.165
--- src/sys/netinet6/raw_ip6.c:1.164 Mon Feb 26 09:13:00 2018
+++ src/sys/netinet6/raw_ip6.c Wed Feb 28 11:23:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.164 2018/02/26 09:13:00 maxv Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.165 2018/02/28 11:23:24 maxv 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.164 2018/02/26 09:13:00 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.165 2018/02/28 11:23:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -100,7 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/ipsec_private.h>
#include <netipsec/ipsec6.h>
#endif
Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.136 src/sys/netinet6/udp6_usrreq.c:1.137
--- src/sys/netinet6/udp6_usrreq.c:1.136 Wed Feb 28 11:09:03 2018
+++ src/sys/netinet6/udp6_usrreq.c Wed Feb 28 11:23:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_usrreq.c,v 1.136 2018/02/28 11:09:03 maxv Exp $ */
+/* $NetBSD: udp6_usrreq.c,v 1.137 2018/02/28 11:23:24 maxv Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.136 2018/02/28 11:09:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.137 2018/02/28 11:23:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.
#ifdef IPSEC
#include <netipsec/ipsec.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/ipsec_private.h>
#ifdef INET6
#include <netipsec/ipsec6.h>
#endif
