From 984e2e527bad54a09331f0b07a27c2a205be8af1 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 25 Jan 2023 23:09:02 -0500 Subject: [PATCH] openbsd_network: Move ifq_*_oactive wrappers to a common header. --- .../network/wlan/iaxwifi200/dev/pci/if_iwx.c | 4 +--- .../network/wlan/idualwifi7260/dev/pci/if_iwm.c | 4 +--- src/libs/compat/openbsd_network/compat/net/ifq.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/libs/compat/openbsd_network/compat/net/ifq.h diff --git a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c index 0789e5e8cf..f818c50884 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c +++ b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c @@ -135,11 +135,9 @@ #ifdef __FreeBSD_version #include +#include #define DEVNAME(_s) gDriverName #define SC_DEV_FOR_PCI sc->sc_dev -#define ifq_is_oactive(IFQ) ((if_getdrvflags(ifp) & IFF_DRV_OACTIVE) != 0) -#define ifq_set_oactive(IFQ) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0) -#define ifq_clr_oactive(IFQ) if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE) #define mallocarray(nmemb, size, type, flags) malloc((size) * (nmemb), (type), (flags)) #else #define DEVNAME(_s) ((_s)->sc_dev.dv_xname) diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c index bea8ddb859..5c982d9321 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c @@ -151,11 +151,9 @@ #ifdef __FreeBSD_version #include +#include #define DEVNAME(_s) gDriverName #define SC_DEV_FOR_PCI sc->sc_dev -#define ifq_is_oactive(IFQ) ((if_getdrvflags(ifp) & IFF_DRV_OACTIVE) != 0) -#define ifq_set_oactive(IFQ) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0) -#define ifq_clr_oactive(IFQ) if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE) #else #define DEVNAME(_s) ((_s)->sc_dev.dv_xname) #endif diff --git a/src/libs/compat/openbsd_network/compat/net/ifq.h b/src/libs/compat/openbsd_network/compat/net/ifq.h new file mode 100644 index 0000000000..502e52b8b8 --- /dev/null +++ b/src/libs/compat/openbsd_network/compat/net/ifq.h @@ -0,0 +1,14 @@ +/* + * Copyright 2022, Haiku, Inc. All rights reserved. + * Distributed under the terms of the MIT License. + */ +#ifndef _OBSD_COMPAT_NET_IFQ_H_ +#define _OBSD_COMPAT_NET_IFQ_H_ + + +#define ifq_is_oactive(IFQ) ((if_getdrvflags(ifp) & IFF_DRV_OACTIVE) != 0) +#define ifq_set_oactive(IFQ) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0) +#define ifq_clr_oactive(IFQ) if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE) + + +#endif /* _OBSD_COMPAT_NET_IFQ_H_ */