i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd_network: Remove some now-unneeded methods and compatibility macros.

Browse Source
This commit is contained in:
Augustin Cavalier
2024-06-25 18:35:03 -04:00
parent 5a39afd352
commit 4780e4d4df
3 changed files with 2 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/compat/net/if_var.h
-5
View File
@@ -724,7 +724,6 @@ int if_delmulti(struct ifnet *, struct sockaddr *);
void if_detach(struct ifnet *);
void if_purgeaddrs(struct ifnet *);
void if_delallmulti(struct ifnet *);
void if_purgemaddrs(struct ifnet *);
void if_down(struct ifnet *);
void if_free(struct ifnet *);
void if_free_type(struct ifnet *, u_char);
@@ -844,10 +843,6 @@ bool if_altq_is_enabled(if_t ifp);
void if_bpfmtap(if_t ifp, struct mbuf *m);
void if_etherbpfmtap(if_t ifp, struct mbuf *m);
int if_setupmultiaddr(if_t ifp, void *mta, int *cnt, int max);
int if_multiaddr_array(if_t ifp, void *mta, int *cnt, int max);
int if_multiaddr_count(if_t ifp, int max);
/*
* Traversing through interface address lists.
*/
src/libs/compat/freebsd_network/compat/sys/haiku-module.h
+2 -16
View File
@@ -69,26 +69,12 @@ typedef struct {
#define DEFINE_CLASS_0(name, driver, methods, size) \
driver_t driver = { #name, methods, size }
#define DRIVER_MODULE5(name, busname, driver, evh, arg) \
#define DRIVER_MODULE(name, busname, driver, evh, arg) \
driver_t *DRIVER_MODULE_NAME(name, busname) = &(driver)
#define DRIVER_MODULE_ORDERED6(name, busname, driver, evh, arg, order) \
#define DRIVER_MODULE_ORDERED(name, busname, driver, evh, arg, order) \
DRIVER_MODULE(name, busname, driver, evh, arg)
/* backwards compatibility */
#define _DRIVER_MODULE_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, NAME, ...) \
NAME
#define DRIVER_MODULE_ORDERED7(name, busname, driver, devclass, evh, arg, order) \
DRIVER_MODULE_ORDERED6(name, busname, driver,, evh, arg, order)
#define DRIVER_MODULE_ORDERED(...) \
_DRIVER_MODULE_MACRO(__VA_ARGS__, INVALID, \
DRIVER_MODULE_ORDERED7, DRIVER_MODULE_ORDERED6)(__VA_ARGS__)
#define DRIVER_MODULE6(name, busname, driver, devclass, evh, arg) \
DRIVER_MODULE5(name, busname, driver, evh, arg)
#define DRIVER_MODULE(...) \
_DRIVER_MODULE_MACRO(__VA_ARGS__, INVALID, INVALID, \
DRIVER_MODULE6, DRIVER_MODULE5)(__VA_ARGS__)
#define DRIVER_MODULE_NAME(name, busname) \
__fbsd_ ## name ## _ ## busname
src/libs/compat/freebsd_network/if.c
-70
View File
@@ -703,18 +703,6 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa)
}
void
if_purgemaddrs(struct ifnet *ifp)
{
struct ifmultiaddr *ifma;
struct ifmultiaddr *next;
IF_ADDR_LOCK(ifp);
TAILQ_FOREACH_SAFE(ifma, &ifp->if_multiaddrs, ifma_link, next)
if_delmulti_locked(ifp, ifma, 1);
IF_ADDR_UNLOCK(ifp);
}
/*
* Return counter values from counter(9)s stored in ifnet.
*/
@@ -938,64 +926,6 @@ if_inc_counter(struct ifnet *ifp, ift_counter cnt, int64_t inc)
}
}
/* XXX */
#ifndef ETH_ADDR_LEN
#define ETH_ADDR_LEN 6
#endif
int
if_setupmultiaddr(if_t ifp, void *mta, int *cnt, int max)
{
struct ifmultiaddr *ifma;
uint8_t *lmta = (uint8_t *)mta;
int mcnt = 0;
TAILQ_FOREACH(ifma, &((struct ifnet *)ifp)->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
if (mcnt == max)
break;
bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
&lmta[mcnt * ETH_ADDR_LEN], ETH_ADDR_LEN);
mcnt++;
}
*cnt = mcnt;
return (0);
}
int
if_multiaddr_array(if_t ifp, void *mta, int *cnt, int max)
{
int error;
if_maddr_rlock(ifp);
error = if_setupmultiaddr(ifp, mta, cnt, max);
if_maddr_runlock(ifp);
return (error);
}
int
if_multiaddr_count(if_t ifp, int max)
{
struct ifmultiaddr *ifma;
int count;
count = 0;
if_maddr_rlock(ifp);
TAILQ_FOREACH(ifma, &((struct ifnet *)ifp)->if_multiaddrs, ifma_link) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
count++;
if (count == max)
break;
}
if_maddr_runlock(ifp);
return (count);
}
void
if_bpfmtap(if_t ifh, struct mbuf *m)
{