diff options
author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-12-17 16:05:31 +0000 |
---|---|---|
committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-12-17 16:05:31 +0000 |
commit | d0fcb5bba971e4090a060e1db3e3fbb8e1e8a7ac (patch) | |
tree | 1646fc6fb4cb074cd02515473d3cf11a05911ffe /sys/netinet/if_ether.c | |
parent | b6fc0869c6abc0ad59d0ff173dca7e9d3a9cf0f2 (diff) |
rm a bit more trailers code. no longer accept them as alias for ethernet.
ok mpi
Diffstat (limited to 'sys/netinet/if_ether.c')
-rw-r--r-- | sys/netinet/if_ether.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index a2f80a62115..277534f5628 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.197 2015/12/02 22:02:18 claudio Exp $ */ +/* $OpenBSD: if_ether.c,v 1.198 2015/12/17 16:05:30 tedu Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -64,12 +64,6 @@ #include <netinet/ip_carp.h> #endif -/* - * ARP trailer negotiation. Trailer protocol is not IP specific, - * but ARP request/response use IP addresses. - */ -#define ETHERTYPE_IPTRAILERS ETHERTYPE_TRAIL - struct llinfo_arp { LIST_ENTRY(llinfo_arp) la_list; struct rtentry *la_rt; /* backpointer to rtentry */ @@ -454,7 +448,6 @@ arpintr(void) switch (ntohs(ar->ar_pro)) { case ETHERTYPE_IP: - case ETHERTYPE_IPTRAILERS: in_arpinput(m); continue; } @@ -778,7 +771,6 @@ revarpinput(struct mbuf *m) switch (ntohs(ar->ar_pro)) { case ETHERTYPE_IP: - case ETHERTYPE_IPTRAILERS: in_revarpinput(m); return; |