hrev56117 adds 1 changeset to branch 'master'
old head: c35e9b906ac4eb07c61749c2f4f6f48ad8075909
new head: 458c40fb2787fde1b9363cb43d15941591a7b923
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=458c40fb2787+%5Ec35e9b906ac4
----------------------------------------------------------------------------
458c40fb2787: freebsd_network: Drop arpcom from if_arp.h.
It was dropped from FreeBSD somewhere between 9 and 13.
OpenBSD has an equivalent structure but it is not compatible.
Best to avoid it altogether.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev56117
Commit: 458c40fb2787fde1b9363cb43d15941591a7b923
URL: https://git.haiku-os.org/haiku/commit/?id=458c40fb2787
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri May 20 02:04:18 2022 UTC
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 127 deletions(-)
.../compat/freebsd_network/compat/net/if_arp.h | 116 +------------------
src/libs/compat/freebsd_network/if.c | 13 +--
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_network/compat/net/if_arp.h
b/src/libs/compat/freebsd_network/compat/net/if_arp.h
index 2be137aebb..3053583c76 100644
--- a/src/libs/compat/freebsd_network/compat/net/if_arp.h
+++ b/src/libs/compat/freebsd_network/compat/net/if_arp.h
@@ -1,115 +1 @@
-/*-
- * Copyright (c) 1986, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)if_arp.h 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_arp.h,v 1.22 2005/06/10 16:49:18 brooks Exp $
- */
-
-#ifndef _FBSD_COMPAT_NET_IF_ARP_H_
-#define _FBSD_COMPAT_NET_IF_ARP_H_
-
-/*
- * Address Resolution Protocol.
- *
- * See RFC 826 for protocol description. ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified. Field names used correspond to RFC 826.
- */
-struct arphdr {
- u_short ar_hrd; /* format of hardware address */
-#define ARPHRD_ETHER 1 /* ethernet hardware format */
-#define ARPHRD_IEEE802 6 /* token-ring hardware format */
-#define ARPHRD_ARCNET 7 /* arcnet hardware format */
-#define ARPHRD_FRELAY 15 /* frame relay hardware format */
-#define ARPHRD_IEEE1394 24 /* firewire hardware format */
- u_short ar_pro; /* format of protocol address */
- u_char ar_hln; /* length of hardware address */
- u_char ar_pln; /* length of protocol address */
- u_short ar_op; /* one of: */
-#define ARPOP_REQUEST 1 /* request to resolve address */
-#define ARPOP_REPLY 2 /* response to previous request */
-#define ARPOP_REVREQUEST 3 /* request protocol address given
hardware */
-#define ARPOP_REVREPLY 4 /* response giving protocol address */
-#define ARPOP_INVREQUEST 8 /* request to identify peer */
-#define ARPOP_INVREPLY 9 /* response identifying peer */
-/*
- * The remaining fields are variable in size,
- * according to the sizes above.
- */
-#ifdef COMMENT_ONLY
- u_char ar_sha[]; /* sender hardware address */
- u_char ar_spa[]; /* sender protocol address */
- u_char ar_tha[]; /* target hardware address */
- u_char ar_tpa[]; /* target protocol address */
-#endif
-};
-
-#define ar_sha(ap) (((caddr_t)((ap)+1)) + 0)
-#define ar_spa(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln)
-#define ar_tha(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln + (ap)->ar_pln)
-#define ar_tpa(ap) (((caddr_t)((ap)+1)) + 2*(ap)->ar_hln + (ap)->ar_pln)
-
-#define arphdr_len2(ar_hln, ar_pln) \
- (sizeof(struct arphdr) + 2*(ar_hln) + 2*(ar_pln))
-#define arphdr_len(ap) (arphdr_len2((ap)->ar_hln, (ap)->ar_pln))
-
-/*
- * ARP ioctl request
- */
-struct arpreq {
- struct sockaddr arp_pa; /* protocol address */
- struct sockaddr arp_ha; /* hardware address */
- int arp_flags; /* flags */
-};
-/* arp_flags and at_flags field values */
-#define ATF_INUSE 0x01 /* entry in use */
-#define ATF_COM 0x02 /* completed entry (enaddr valid) */
-#define ATF_PERM 0x04 /* permanent entry */
-#define ATF_PUBL 0x08 /* publish entry (respond for other
host) */
-#define ATF_USETRAILERS 0x10 /* has requested trailers */
-
-#ifdef _KERNEL
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.
- */
-struct arpcom {
- struct ifnet *ac_ifp; /* network-visible interface */
- u_char _ac_enaddr[6]; /* ethernet hardware address */
- void *ac_netgraph; /* ng_ether(4) netgraph node info */
-};
-#define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com))
-#define IFP2ENADDR(ifp) (IFP2AC(ifp)->_ac_enaddr)
-#define AC2IFP(ac) ((ac)->ac_ifp)
-
-#endif
-
-#endif /* _FBSD_COMPAT_NET_IF_ARP_H_ */
+/* nothing here */
diff --git a/src/libs/compat/freebsd_network/if.c
b/src/libs/compat/freebsd_network/if.c
index bc8883ee77..3cc00e6bb5 100644
--- a/src/libs/compat/freebsd_network/if.c
+++ b/src/libs/compat/freebsd_network/if.c
@@ -165,17 +165,6 @@ if_alloc(u_char type)
if (ifp->receive_sem < B_OK)
goto err1;
- switch (type) {
- case IFT_ETHER:
- {
- ifp->if_l2com = _kernel_malloc(sizeof(struct arpcom),
M_ZERO);
- if (ifp->if_l2com == NULL)
- goto err2;
- IFP2AC(ifp)->ac_ifp = ifp;
- break;
- }
- }
-
ifp->link_state_sem = -1;
ifp->open_count = 0;
ifp->flags = 0;
@@ -183,7 +172,7 @@ if_alloc(u_char type)
ifq_init(&ifp->receive_queue, semName);
ifp->scan_done_sem = -1;
- // WLAN specific, doesn't hurt when initilized for other devices
+ // WLAN specific, doesn't hurt when initialized for other
devices
// Search for the first free device slot, and use that one
IFNET_WLOCK();
