summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_input.c
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2013-03-14 11:18:37 +0000
committermpi <mpi@openbsd.org>2013-03-14 11:18:37 +0000
commitf6b583ae338616fac004b1cfc55ec127c55729da (patch)
tree839fd2c42ef313410024bcf4e2246df39915b3d4 /sys/netinet/tcp_input.c
parenttedu faithd(8), suggested by todd@ some weeks ago after a submission by (diff)
downloadwireguard-openbsd-f6b583ae338616fac004b1cfc55ec127c55729da.tar.xz
wireguard-openbsd-f6b583ae338616fac004b1cfc55ec127c55729da.zip
tedu faith(4), suggested by todd@ some weeks ago after a submission by
dhill. ok krw@, mikeb@, tedu@ (implicit)
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r--sys/netinet/tcp_input.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 2548504386e..639e995ddc8 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.255 2013/01/17 11:43:06 bluhm Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.256 2013/03/14 11:18:37 mpi Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -95,11 +95,6 @@
#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
-#include "faith.h"
-#if NFAITH > 0
-#include <net/if_types.h>
-#endif
-
#include "pf.h"
#if NPF > 0
#include <net/pfvar.h>
@@ -347,16 +342,6 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
{
struct mbuf *m = *mp;
-#if NFAITH > 0
- if (m->m_pkthdr.rcvif) {
- if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) {
- /* XXX send icmp6 host/port unreach? */
- m_freem(m);
- return IPPROTO_DONE;
- }
- }
-#endif
-
tcp_input(m, *offp, proto);
return IPPROTO_DONE;
}