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

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

details:   https://anonhg.NetBSD.org/src/rev/2090940c84d8
branches:  trunk
changeset: 807155:2090940c84d8
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Mar 30 04:25:26 2015 +0000

description:
Tidy up opt_ipsec.h inclusions

diffstat:

 sys/netinet6/nd6.c         |   5 ++---
 sys/netinet6/nd6_nbr.c     |   5 ++---
 sys/netinet6/udp6_usrreq.c |  14 ++++++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 2c33cd15b94c -r 2090940c84d8 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Mon Mar 30 03:51:50 2015 +0000
+++ b/sys/netinet6/nd6.c        Mon Mar 30 04:25:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6.c,v 1.160 2015/02/25 12:45:34 roy Exp $    */
+/*     $NetBSD: nd6.c,v 1.161 2015/03/30 04:25:26 ozaki-r Exp $        */
 /*     $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $   */
 
 /*
@@ -31,11 +31,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.160 2015/02/25 12:45:34 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.161 2015/03/30 04:25:26 ozaki-r Exp $");
 
 #include "bridge.h"
 #include "carp.h"
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 2c33cd15b94c -r 2090940c84d8 sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c    Mon Mar 30 03:51:50 2015 +0000
+++ b/sys/netinet6/nd6_nbr.c    Mon Mar 30 04:25:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6_nbr.c,v 1.106 2015/02/25 12:45:34 roy Exp $        */
+/*     $NetBSD: nd6_nbr.c,v 1.107 2015/03/30 04:25:26 ozaki-r Exp $    */
 /*     $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $        */
 
 /*
@@ -31,10 +31,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.106 2015/02/25 12:45:34 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.107 2015/03/30 04:25:26 ozaki-r Exp $");
 
 #include "opt_inet.h"
-#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 2c33cd15b94c -r 2090940c84d8 sys/netinet6/udp6_usrreq.c
--- a/sys/netinet6/udp6_usrreq.c        Mon Mar 30 03:51:50 2015 +0000
+++ b/sys/netinet6/udp6_usrreq.c        Mon Mar 30 04:25:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp6_usrreq.c,v 1.115 2014/08/09 05:33:01 rtr Exp $    */
+/*     $NetBSD: udp6_usrreq.c,v 1.116 2015/03/30 04:25:26 ozaki-r Exp $        */
 /*     $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $    */
 
 /*
@@ -62,10 +62,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.115 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.116 2015/03/30 04:25:26 ozaki-r Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_csum.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -103,6 +104,15 @@
 #include <netinet6/ip6protosw.h>
 #include <netinet6/scope6_var.h>
 
+#ifdef IPSEC
+#include <netipsec/ipsec.h>
+#include <netipsec/ipsec_var.h>
+#include <netipsec/ipsec_private.h>
+#ifdef INET6
+#include <netipsec/ipsec6.h>
+#endif
+#endif /* IPSEC */
+
 #include "faith.h"
 #if defined(NFAITH) && NFAITH > 0
 #include <net/if_faith.h>