diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2008-06-14 22:15:31 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2008-06-14 22:15:31 +0000 |
| commit | f9de788d96ae6a900a3daee6f9e3d7e729ca16ce (patch) | |
| tree | f5cc8a7d4ab6d5d165dda78928796c026ad50ba0 /sys | |
| parent | 22b780448ceea4f9a73676685094acb18fa5063b (diff) | |
Include "faith.h" in order to get NFAITH. Also clean up NFAITH conditionals
whilst we're here.
ok henning@ deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 5812996fb88..ebe272227fe 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.218 2008/06/12 15:13:47 jsing Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.219 2008/06/14 22:15:30 jsing Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -95,6 +95,8 @@ #include <netinet/tcpip.h> #include <netinet/tcp_debug.h> +#include "faith.h" + struct tcpiphdr tcp_saveti; int tcp_mss_adv(struct ifnet *, int); @@ -325,7 +327,7 @@ tcp6_input(struct mbuf **mp, int *offp, int proto) { struct mbuf *m = *mp; -#if defined(NFAITH) && 0 < NFAITH +#if NFAITH > 0 if (m->m_pkthdr.rcvif) { if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) { /* XXX send icmp6 host/port unreach? */ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 5a67ac33f66..bdff3b53b98 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.122 2008/06/14 19:54:09 jsing Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.123 2008/06/14 22:15:30 jsing Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -103,6 +103,8 @@ extern int ip6_defhlim; #endif /* INET6 */ +#include "faith.h" + /* * UDP protocol implementation. * Per RFC 768, August, 1980. @@ -141,7 +143,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto) { struct mbuf *m = *mp; -#if defined(NFAITH) && 0 < NFAITH +#if NFAITH > 0 if (m->m_pkthdr.rcvif) { if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) { /* XXX send icmp6 host/port unreach? */ |