diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2020-05-29 19:22:40 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2020-05-29 19:22:40 +0000 |
| commit | 28d2a72bbfa47c52b06a5a535b10a11dc9a1de72 (patch) | |
| tree | 02085b90a2817709a36911498e2442b0fb441693 | |
| parent | 4bcbd26ff8ba994b042e655dd2c865f3722c0899 (diff) | |
| download | src-28d2a72bbfa47c52b06a5a535b10a11dc9a1de72.tar.gz src-28d2a72bbfa47c52b06a5a535b10a11dc9a1de72.zip | |
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
Notes
Notes:
svn path=/head/; revision=361633
| -rw-r--r-- | sys/net/if_enc.c | 1 | ||||
| -rw-r--r-- | sys/net/if_ipsec.c | 1 | ||||
| -rw-r--r-- | sys/netipsec/ipsec.h | 5 | ||||
| -rw-r--r-- | sys/netipsec/ipsec_mbuf.c | 2 | ||||
| -rw-r--r-- | sys/netipsec/xform_ah.c | 1 | ||||
| -rw-r--r-- | sys/netipsec/xform_esp.c | 1 | ||||
| -rw-r--r-- | sys/netipsec/xform_ipcomp.c | 1 |
7 files changed, 7 insertions, 5 deletions
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 26886d0052bb..af1d16f11a18 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -32,6 +32,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_ipsec.c b/sys/net/if_ipsec.c index 0b2a2d48daa7..737d840bbac7 100644 --- a/sys/net/if_ipsec.c +++ b/sys/net/if_ipsec.c @@ -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> diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 0124b12c20cd..e7a359159aa0 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -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> diff --git a/sys/netipsec/ipsec_mbuf.c b/sys/netipsec/ipsec_mbuf.c index 4127e06c9973..170728f91bde 100644 --- a/sys/netipsec/ipsec_mbuf.c +++ b/sys/netipsec/ipsec_mbuf.c @@ -32,6 +32,8 @@ * IPsec-specific mbuf routines. */ +#include "opt_ipsec.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c index 8c6032a070c1..50e913512a0d 100644 --- a/sys/netipsec/xform_ah.c +++ b/sys/netipsec/xform_ah.c @@ -38,6 +38,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 8a378c4adaf8..c8be18bf868a 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -37,6 +37,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index b2d98b82bf87..0949062f4395 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -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> |