Module Name: src
Committed By: roy
Date: Tue Nov 15 09:15:44 UTC 2022
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
Revert prior.
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/sys/netinet/if_arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.309 src/sys/netinet/if_arp.c:1.310
--- src/sys/netinet/if_arp.c:1.309 Mon Nov 14 09:32:21 2022
+++ src/sys/netinet/if_arp.c Tue Nov 15 09:15:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.309 2022/11/14 09:32:21 roy Exp $ */
+/* $NetBSD: if_arp.c,v 1.310 2022/11/15 09:15:43 roy Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.309 2022/11/14 09:32:21 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.310 2022/11/15 09:15:43 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -932,8 +932,6 @@ again:
/*
* DAD check, RFC 5227.
- * ARP sender hardware address must match the interface
- * address of the interface sending the packet.
* Collision on sender address is always a duplicate.
* Collision on target address is only a duplicate
* IF the sender address is the null host (ie a DAD probe)
@@ -945,10 +943,7 @@ again:
(in_hosteq(isaddr, myaddr) ||
(in_nullhost(isaddr) && in_hosteq(itaddr, myaddr) &&
m->m_flags & M_BCAST &&
- ia->ia4_flags & (IN_IFF_TENTATIVE | IN_IFF_DUPLICATED))) &&
- m->m_pkthdr.l2_shalen == ah->ar_hln && (
- ah->ar_hln == 0 ||
- memcmp(m->m_pkthdr.l2_sha, ar_sha(ah), ah->ar_hln) == 0))
+ ia->ia4_flags & (IN_IFF_TENTATIVE | IN_IFF_DUPLICATED))))
{
struct sockaddr_dl sdl, *sdlp;
