summaryrefslogtreecommitdiff
path: root/sys/netinet/if_ether.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-10-22 18:14:54 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-10-22 18:14:54 +0000
commit784827f4d4fbf5ed3c3a05c9b46249593783b899 (patch)
tree200226818e3d9c7a4166f4e848a4e4589ea39af3 /sys/netinet/if_ether.c
parent739de27d93b04590df01255c8258c80d4efbf438 (diff)
Drop historical comment and an old '#if notyet'.
Diffstat (limited to 'sys/netinet/if_ether.c')
-rw-r--r--sys/netinet/if_ether.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index b5b63d1cb4a..7e5e32e470e 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.c,v 1.175 2015/10/22 16:44:54 mpi Exp $ */
+/* $OpenBSD: if_ether.c,v 1.176 2015/10/22 18:14:53 mpi Exp $ */
/* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */
/*
@@ -496,18 +496,9 @@ arpintr(void)
}
/*
- * ARP for Internet protocols on Ethernet.
- * Algorithm is that given in RFC 826.
+ * ARP for Internet protocols on Ethernet, RFC 826.
* In addition, a sanity check is performed on the sender
* protocol address, to catch impersonators.
- * We no longer handle negotiations for use of trailer protocol:
- * Formerly, ARP replied for protocol type ETHERTYPE_TRAIL sent
- * along with IP replies if we wanted trailers sent to us,
- * and also sent them in response to IP replies.
- * This allowed either end to announce the desire to receive
- * trailer packets.
- * We no longer reply to requests for ETHERTYPE_TRAIL protocol either,
- * but formerly didn't normally send requests.
*/
void
in_arpinput(struct mbuf *m)
@@ -542,13 +533,6 @@ in_arpinput(struct mbuf *m)
op = ntohs(ea->arp_op);
if ((op != ARPOP_REQUEST) && (op != ARPOP_REPLY))
goto out;
-#if notyet
- if ((op == ARPOP_REPLY) && (m->m_flags & (M_BCAST|M_MCAST))) {
- log(LOG_ERR,
- "arp: received reply to broadcast or multicast address\n");
- goto out;
- }
-#endif
memcpy(&itaddr, ea->arp_tpa, sizeof(itaddr));
memcpy(&isaddr, ea->arp_spa, sizeof(isaddr));