svn commit: r361633 - in head/sys: net netipsec

[John Baldwin]

Author: jhb
Date: Fri May 29 19:22:40 2020
New Revision: 361633
URL: https://svnweb.freebsd.org/changeset/base/361633

Log:
  Consistently include opt_ipsec.h for consumers of <netipsec/ipsec.h>.
  
  This fixes ipsec.ko to include all of IPSEC_DEBUG.
  
  Reviewed by:	imp
  MFC after:	2 weeks
  Sponsored by:	Netflix
  Differential Revision:	https://reviews.freebsd.org/D25046

Modified:
  head/sys/net/if_enc.c
  head/sys/net/if_ipsec.c
  head/sys/netipsec/ipsec.h
  head/sys/netipsec/ipsec_mbuf.c
  head/sys/netipsec/xform_ah.c
  head/sys/netipsec/xform_esp.c
  head/sys/netipsec/xform_ipcomp.c

Modified: head/sys/net/if_enc.c
==============================================================================
--- head/sys/net/if_enc.c	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/net/if_enc.c	Fri May 29 19:22:40 2020	(r361633)
@@ -32,6 +32,7 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/net/if_ipsec.c
==============================================================================
--- head/sys/net/if_ipsec.c	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/net/if_ipsec.c	Fri May 29 19:22:40 2020	(r361633)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netipsec/ipsec.h
==============================================================================
--- head/sys/netipsec/ipsec.h	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/netipsec/ipsec.h	Fri May 29 19:22:40 2020	(r361633)
@@ -39,11 +39,6 @@
 #ifndef _NETIPSEC_IPSEC_H_
 #define _NETIPSEC_IPSEC_H_
 
-#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE)
-#include "opt_inet.h"
-#include "opt_ipsec.h"
-#endif
-
 #include <net/pfkeyv2.h>
 #include <netipsec/keydb.h>
 

Modified: head/sys/netipsec/ipsec_mbuf.c
==============================================================================
--- head/sys/netipsec/ipsec_mbuf.c	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/netipsec/ipsec_mbuf.c	Fri May 29 19:22:40 2020	(r361633)
@@ -32,6 +32,8 @@
  * IPsec-specific mbuf routines.
  */
 
+#include "opt_ipsec.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

Modified: head/sys/netipsec/xform_ah.c
==============================================================================
--- head/sys/netipsec/xform_ah.c	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/netipsec/xform_ah.c	Fri May 29 19:22:40 2020	(r361633)
@@ -38,6 +38,7 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netipsec/xform_esp.c
==============================================================================
--- head/sys/netipsec/xform_esp.c	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/netipsec/xform_esp.c	Fri May 29 19:22:40 2020	(r361633)
@@ -37,6 +37,7 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

Modified: head/sys/netipsec/xform_ipcomp.c
==============================================================================
--- head/sys/netipsec/xform_ipcomp.c	Fri May 29 19:21:35 2020	(r361632)
+++ head/sys/netipsec/xform_ipcomp.c	Fri May 29 19:22:40 2020	(r361633)
@@ -33,6 +33,7 @@
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>