Permalink
Browse files

cleanup ipsec.h dependency

  • Loading branch information...
1 parent 2bd7d80 commit 3f3c95deb6328ec427dc1ab96e1fb3671ce8b945 itojun committed Nov 2, 2002
Showing with 8 additions and 4 deletions.
  1. +3 −4 netbsd/sys/netinet/in_pcb.h
  2. +1 −0 netbsd/sys/netinet/in_proto.c
  3. +4 −0 netbsd/sys/netinet/tcp_output.c
View
7 netbsd/sys/netinet/in_pcb.h
@@ -68,9 +68,6 @@
#define _NETINET_IN_PCB_H_
#include <sys/queue.h>
-#if 1 /*IPSEC*/
-#include <netinet6/ipsec.h>
-#endif
/*
* Common structure pcb for internet protocol implementation.
@@ -79,6 +76,8 @@
* up (to a socket structure) and down (to a protocol-specific)
* control block.
*/
+struct inpcbpolicy;
+
struct inpcb {
LIST_ENTRY(inpcb) inp_hash;
CIRCLEQ_ENTRY(inpcb) inp_queue;
@@ -95,7 +94,7 @@ struct inpcb {
int inp_errormtu; /* MTU of last xmit status = EMSGSIZE */
struct inpcbtable *inp_table;
#if 1 /*IPSEC*/
- struct inpcbpolicy *inp_sp; /* security policy. */
+ struct inpcbpolicy *inp_sp; /* security policy. */
#endif
};
#define inp_faddr inp_ip.ip_dst
View
1 netbsd/sys/netinet/in_proto.c
@@ -124,6 +124,7 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.55 2002/03/04 13:24:12 sommerfeld Exp
*/
#ifdef IPSEC
+#include <netinet6/ipsec.h>
#include <netinet6/ah.h>
#ifdef IPSEC_ESP
#include <netinet6/esp.h>
View
4 netbsd/sys/netinet/tcp_output.c
@@ -179,6 +179,10 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.79.4.1 2002/06/14 17:32:59 lukem Ex
#include <netinet6/nd6.h>
#endif
+#ifdef IPSEC
+#include <netinet6/ipsec.h>
+#endif
+
#include <netinet/tcp.h>
#define TCPOUTFLAGS
#include <netinet/tcp_fsm.h>

0 comments on commit 3f3c95d

Please sign in to comment.