[src/trunk]: src/sys Revert prior.

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bab73a59ac9
branches:  trunk
changeset: 372323:6bab73a59ac9
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Nov 15 09:13:43 2022 +0000

description:
Revert prior.

diffstat:

 sys/net/if_ethersubr.c |   8 ++------
 sys/netinet/if_arp.c   |  11 +++--------
 sys/sys/mbuf.h         |   9 +++------
 3 files changed, 8 insertions(+), 20 deletions(-)

diffs (98 lines):

diff -r 10492c6b1ec3 -r 6bab73a59ac9 sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Tue Nov 15 07:58:00 2022 +0000
+++ b/sys/net/if_ethersubr.c    Tue Nov 15 09:13:43 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.321 2022/11/14 09:23:42 roy Exp $   */
+/*     $NetBSD: if_ethersubr.c,v 1.322 2022/11/15 09:14:28 roy Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.321 2022/11/14 09:23:42 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.322 2022/11/15 09:14:28 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -886,10 +886,6 @@
 #endif
        }
 
-       /* Store the senders hardware address */
-       m->m_pkthdr.l2_sha = &eh->ether_shost;
-       m->m_pkthdr.l2_shalen = ETHER_ADDR_LEN;
-
        /* Strip off the Ethernet header. */
        m_adj(m, ehlen);
 
diff -r 10492c6b1ec3 -r 6bab73a59ac9 sys/netinet/if_arp.c
--- a/sys/netinet/if_arp.c      Tue Nov 15 07:58:00 2022 +0000
+++ b/sys/netinet/if_arp.c      Tue Nov 15 09:13:43 2022 +0000
@@ -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 @@
 
        /*
         * 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 @@
            (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;
 
diff -r 10492c6b1ec3 -r 6bab73a59ac9 sys/sys/mbuf.h
--- a/sys/sys/mbuf.h    Tue Nov 15 07:58:00 2022 +0000
+++ b/sys/sys/mbuf.h    Tue Nov 15 09:13:43 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbuf.h,v 1.234 2022/11/14 10:15:08 roy Exp $   */
+/*     $NetBSD: mbuf.h,v 1.235 2022/11/15 09:13:43 roy Exp $   */
 
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -178,8 +178,8 @@
  * checksum) -- this is so we can accumulate the checksum for fragmented
  * packets during reassembly.
  *
- * Size ILP32: 48
- *       LP64: 72
+ * Size ILP32: 40
+ *       LP64: 56
  */
 struct pkthdr {
        union {
@@ -203,9 +203,6 @@
        int     pattr_af;               /* ALTQ: address family */
        void    *pattr_class;           /* ALTQ: sched class set by classifier */
        void    *pattr_hdr;             /* ALTQ: saved header position in mbuf */
-
-       void            *l2_sha;                /* l2 sender host address */
-       size_t          l2_shalen;              /* length of the sender address */
 };
 
 /* Checksumming flags (csum_flags). */