diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-12-06 02:12:53 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-12-06 02:12:53 +0000 |
| commit | fe0c76fa020ef6f875def62acaba4da29dc1205a (patch) | |
| tree | 547afe9cf0b5e7eaa3c65038e3baca072c0fc6b9 /sys/netinet | |
| parent | 389376064ca859f5d90db130fea36ccd538859ef (diff) | |
remove #if 0'ed portion (for KAME IPSEC - not needed)
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_pcb.c | 10 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 5 |
2 files changed, 2 insertions, 13 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index ecf7650e276..d6f8a930373 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.56 2001/07/05 16:45:54 jjbg Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.57 2001/12/06 02:12:52 itojun Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -543,14 +543,6 @@ in_pcbdetach(v) struct socket *so = inp->inp_socket; int s; -#if 0 /*KAME IPSEC*/ - if (so->so_pcb) { - KEYDEBUG(KEYDEBUG_KEY_STAMP, - printf("DP call free SO=%p from in_pcbdetach\n", so)); - key_freeso(so); - } - ipsec4_delete_pcbpolicy(inp); -#endif /*IPSEC*/ so->so_pcb = 0; sofree(so); if (inp->inp_options) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index a7e35ed31d2..9571d574b34 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.94 2001/11/26 16:50:26 jasoni Exp $ */ +/* $OpenBSD: ip_input.c,v 1.95 2001/12/06 02:12:52 itojun Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -1478,9 +1478,6 @@ ip_forward(m, srcrt) } } -#if 0 /*KAME IPSEC*/ - m->m_pkthdr.rcvif = NULL; -#endif /*IPSEC*/ error = ip_output(m, (struct mbuf *)0, &ipforward_rt, (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), 0, NULL, NULL); |