[src/trunk]: src/sys/netipsec Tidy up opt_ipsec.h inclusions

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b509d7f6018a
branches:  trunk
changeset: 337012:b509d7f6018a
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Mar 30 03:51:50 2015 +0000

description:
Tidy up opt_ipsec.h inclusions

Some inclusions of opt_ipsec.h were for IPSEC_NAT_T and are now unnecessary.
Add inclusions to some C files for IPSEC_DEBUG.

diffstat:

 sys/netipsec/ipsec_input.c  |  5 ++---
 sys/netipsec/ipsec_output.c |  5 ++---
 sys/netipsec/key.h          |  4 +---
 sys/netipsec/key_debug.c    |  5 ++---
 sys/netipsec/keydb.h        |  4 +---
 sys/netipsec/keysock.c      |  6 ++----
 sys/netipsec/xform_ah.c     |  5 +++--
 sys/netipsec/xform_esp.c    |  5 +++--
 8 files changed, 16 insertions(+), 23 deletions(-)

diffs (181 lines):

diff -r 600ed113214b -r b509d7f6018a sys/netipsec/ipsec_input.c
--- a/sys/netipsec/ipsec_input.c        Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/ipsec_input.c        Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_input.c,v 1.32 2014/03/08 12:18:04 ozaki-r Exp $ */
+/*     $NetBSD: ipsec_input.c,v 1.33 2015/03/30 03:51:50 ozaki-r Exp $ */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
 /*     $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $        */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.32 2014/03/08 12:18:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.33 2015/03/30 03:51:50 ozaki-r Exp $");
 
 /*
  * IPsec input processing.
@@ -49,7 +49,6 @@
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/ipsec_output.c
--- a/sys/netipsec/ipsec_output.c       Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/ipsec_output.c       Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_output.c,v 1.40 2013/11/03 18:37:10 mrg Exp $    */
+/*     $NetBSD: ipsec_output.c,v 1.41 2015/03/30 03:51:50 ozaki-r Exp $        */
 
 /*-
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.40 2013/11/03 18:37:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.41 2015/03/30 03:51:50 ozaki-r Exp $");
 
 /*
  * IPsec output processing.
@@ -38,7 +38,6 @@
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/key.h
--- a/sys/netipsec/key.h        Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/key.h        Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.h,v 1.13 2014/05/30 01:39:03 christos Exp $        */
+/*     $NetBSD: key.h,v 1.14 2015/03/30 03:51:50 ozaki-r Exp $ */
 /*     $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $        */
 /*     $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $    */
 
@@ -36,8 +36,6 @@
 
 #ifdef _KERNEL
 
-#include "opt_ipsec.h"
-
 struct secpolicy;
 struct secpolicyindex;
 struct ipsecrequest;
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/key_debug.c
--- a/sys/netipsec/key_debug.c  Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/key_debug.c  Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key_debug.c,v 1.11 2011/05/23 15:17:25 drochner Exp $  */
+/*     $NetBSD: key_debug.c,v 1.12 2015/03/30 03:51:50 ozaki-r Exp $   */
 /*     $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $      */
 
@@ -33,14 +33,13 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.11 2011/05/23 15:17:25 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.12 2015/03/30 03:51:50 ozaki-r Exp $");
 #endif
 
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
-#include "opt_ipsec.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/keydb.h
--- a/sys/netipsec/keydb.h      Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/keydb.h      Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: keydb.h,v 1.13 2013/06/04 22:47:37 christos Exp $      */
+/*     $NetBSD: keydb.h,v 1.14 2015/03/30 03:51:50 ozaki-r Exp $       */
 /*     $FreeBSD: src/sys/netipsec/keydb.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $      */
 /*     $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $  */
 
@@ -36,8 +36,6 @@
 
 #ifdef _KERNEL
 
-#include "opt_ipsec.h"
-
 #include <netipsec/key_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/keysock.c
--- a/sys/netipsec/keysock.c    Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/keysock.c    Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: keysock.c,v 1.43 2014/08/09 05:33:01 rtr Exp $ */
+/*     $NetBSD: keysock.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $     */
 /*     $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $    */
 /*     $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $        */
 
@@ -32,9 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.43 2014/08/09 05:33:01 rtr Exp $");
-
-#include "opt_ipsec.h"
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $");
 
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/xform_ah.c
--- a/sys/netipsec/xform_ah.c   Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/xform_ah.c   Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ah.c,v 1.43 2015/03/27 05:47:37 ozaki-r Exp $    */
+/*     $NetBSD: xform_ah.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $    */
 /*     $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $   */
 /*     $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
@@ -39,12 +39,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.43 2015/03/27 05:47:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.44 2015/03/30 03:51:50 ozaki-r Exp $");
 
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 600ed113214b -r b509d7f6018a sys/netipsec/xform_esp.c
--- a/sys/netipsec/xform_esp.c  Mon Mar 30 02:23:21 2015 +0000
+++ b/sys/netipsec/xform_esp.c  Mon Mar 30 03:51:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_esp.c,v 1.45 2013/11/03 18:37:10 mrg Exp $       */
+/*     $NetBSD: xform_esp.c,v 1.46 2015/03/30 03:51:50 ozaki-r Exp $   */
 /*     $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,12 +39,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.45 2013/11/03 18:37:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.46 2015/03/30 03:51:50 ozaki-r Exp $");
 
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>