diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-20 14:14:27 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-20 14:14:27 +0000 |
| commit | f5d9bd8a0c0fd38c20f0145f9a1ea932fdef6609 (patch) | |
| tree | 5861de3fa30dd84eb247881b58c1ad91cbeec487 /sys/netinet | |
| parent | 955573b3b1990ab5ec0c8c759add658e84af03e4 (diff) | |
Keep kernel defines under #ifdef _KERNEL.
ok bluhm@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index 187a15eb5bd..1d7fb6c3b2f 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.188 2017/11/15 11:48:59 mpi Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.189 2017/11/20 14:14:26 mpi Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -45,10 +45,6 @@ struct m_tag; /* IPSP global definitions. */ #include <sys/types.h> -#ifdef _KERNEL -#include <sys/timeout.h> -#include <sys/tree.h> -#endif #include <sys/queue.h> #include <netinet/in.h> #include <net/radix.h> @@ -130,6 +126,8 @@ struct sockaddr_encap { #define IPSP_DIRECTION_OUT 0x2 #ifdef _KERNEL +#include <sys/timeout.h> +#include <sys/tree.h> #define sen_data Sen.Data #define sen_ip_src Sen.Sip4.Src @@ -352,7 +350,6 @@ struct tdb { /* tunnel descriptor block */ TAILQ_ENTRY(tdb) tdb_sync_entry; }; -#endif /* _KERNEL */ struct tdb_ident { u_int32_t spi; @@ -394,8 +391,6 @@ struct ipsecinit { #define IPSEC_ZEROES_SIZE 256 /* Larger than an IP6 extension hdr. */ -#ifdef _KERNEL - struct xformsw { u_short xf_type; /* Unique ID of xform */ u_short xf_flags; /* flags (see below) */ |