summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_ether.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index 727e1d3a452..178196bde5d 100644
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ether.c,v 1.57 2011/04/13 22:15:59 markus Exp $ */
+/* $OpenBSD: ip_ether.c,v 1.58 2011/07/04 20:42:15 dhill Exp $ */
/*
* The author of this code is Angelos D. Keromytis (kermit@adk.gr)
*
@@ -122,7 +122,7 @@ etherip_input(struct mbuf *m, ...)
return;
#endif
default:
- DPRINTF(("etherip_input(): dropped, unhandled protcol \n"));
+ DPRINTF(("etherip_input(): dropped, unhandled protocol\n"));
etheripstat.etherip_pdrops++;
m_freem(m);
return;
@@ -138,8 +138,7 @@ etherip_input6(struct mbuf **m, int *offp, int proto)
#if NBRIDGE > 0
case IPPROTO_ETHERIP:
/* If we do not accept EtherIP explicitly, drop. */
- if (proto == IPPROTO_ETHERIP && !etherip_allow &&
- ((*m)->m_flags & (M_AUTH|M_CONF)) == 0) {
+ if (!etherip_allow && ((*m)->m_flags & (M_AUTH|M_CONF)) == 0) {
DPRINTF(("etherip_input6(): dropped due to policy\n"));
etheripstat.etherip_pdrops++;
m_freem(*m);
@@ -154,7 +153,7 @@ etherip_input6(struct mbuf **m, int *offp, int proto)
return IPPROTO_DONE;
#endif
default:
- DPRINTF(("etherip_input6(): dropped, unhandled protcol \n"));
+ DPRINTF(("etherip_input6(): dropped, unhandled protocol\n"));
etheripstat.etherip_pdrops++;
m_freem(*m);
return IPPROTO_DONE;