svn commit: r365277 - in stable: 11/sys/net 11/sys/netipsec 12/sys/net 12/sys/netipsec

[John Baldwin]

Author: jhb
Date: Wed Sep  2 20:36:33 2020
New Revision: 365277
URL: https://svnweb.freebsd.org/changeset/base/365277

Log:
  MFC 361633: Consistently include opt_ipsec.h for consumers of <netipsec/ipsec.h>.
  
  This fixes ipsec.ko to include all of IPSEC_DEBUG.

Modified:
  stable/12/sys/net/if_enc.c
  stable/12/sys/net/if_ipsec.c
  stable/12/sys/netipsec/ipsec.h
  stable/12/sys/netipsec/ipsec_mbuf.c
  stable/12/sys/netipsec/xform_ah.c
  stable/12/sys/netipsec/xform_esp.c
  stable/12/sys/netipsec/xform_ipcomp.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/net/if_enc.c
  stable/11/sys/net/if_ipsec.c
  stable/11/sys/netipsec/ipsec.h
  stable/11/sys/netipsec/ipsec_mbuf.c
  stable/11/sys/netipsec/xform_ah.c
  stable/11/sys/netipsec/xform_esp.c
  stable/11/sys/netipsec/xform_ipcomp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/net/if_enc.c
==============================================================================
--- stable/12/sys/net/if_enc.c	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/net/if_enc.c	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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: stable/12/sys/net/if_ipsec.c
==============================================================================
--- stable/12/sys/net/if_ipsec.c	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/net/if_ipsec.c	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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: stable/12/sys/netipsec/ipsec.h
==============================================================================
--- stable/12/sys/netipsec/ipsec.h	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/netipsec/ipsec.h	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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: stable/12/sys/netipsec/ipsec_mbuf.c
==============================================================================
--- stable/12/sys/netipsec/ipsec_mbuf.c	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/netipsec/ipsec_mbuf.c	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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: stable/12/sys/netipsec/xform_ah.c
==============================================================================
--- stable/12/sys/netipsec/xform_ah.c	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/netipsec/xform_ah.c	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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: stable/12/sys/netipsec/xform_esp.c
==============================================================================
--- stable/12/sys/netipsec/xform_esp.c	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/netipsec/xform_esp.c	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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: stable/12/sys/netipsec/xform_ipcomp.c
==============================================================================
--- stable/12/sys/netipsec/xform_ipcomp.c	Wed Sep  2 20:04:26 2020	(r365276)
+++ stable/12/sys/netipsec/xform_ipcomp.c	Wed Sep  2 20:36:33 2020	(r365277)
@@ -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>