cleanup ipsec.h dependency. commented by perry, sync w/kame

This commit is contained in:
itojun 2002-11-02 19:03:44 +00:00
parent c8815bffa1
commit 61eed162b2
3 changed files with 12 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: in_pcb.h,v 1.31 2002/06/09 16:33:38 itojun Exp $ */
/* $NetBSD: in_pcb.h,v 1.32 2002/11/02 19:03:44 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -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;

View File

@ -1,4 +1,4 @@
/* $NetBSD: in_proto.c,v 1.57 2002/09/25 07:37:12 itojun Exp $ */
/* $NetBSD: in_proto.c,v 1.58 2002/11/02 19:03:44 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.57 2002/09/25 07:37:12 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.58 2002/11/02 19:03:44 itojun Exp $");
#include "opt_mrouting.h"
#include "opt_eon.h" /* ISO CLNL over IP */
@ -114,6 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.57 2002/09/25 07:37:12 itojun Exp $")
*/
#ifdef IPSEC
#include <netinet6/ipsec.h>
#include <netinet6/ah.h>
#ifdef IPSEC_ESP
#include <netinet6/esp.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_output.c,v 1.86 2002/09/13 18:26:55 mycroft Exp $ */
/* $NetBSD: tcp_output.c,v 1.87 2002/11/02 19:03:44 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -142,7 +142,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.86 2002/09/13 18:26:55 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.87 2002/11/02 19:03:44 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -179,6 +179,10 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.86 2002/09/13 18:26:55 mycroft Exp
#include <netinet6/nd6.h>
#endif
#ifdef IPSEC
#include <netinet6/ipsec.h>
#endif
#include <netinet/tcp.h>
#define TCPOUTFLAGS
#include <netinet/tcp_fsm.h>