From 929783d035fd9d3b4098f1369f6b4c7b466d43ad Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Fri, 13 Feb 2004 02:44:49 +0000
Subject: [PATCH] Add __DragonFly__

---
 sys/dev/netif/awi/am79c930.c         |  8 +++----
 sys/dev/netif/awi/awi.c              | 36 ++++++++++++++--------------
 sys/dev/netif/awi/awi_wep.c          | 12 +++++-----
 sys/dev/netif/awi/awi_wicfg.c        | 14 +++++------
 sys/dev/netif/awi/awivar.h           |  6 ++---
 sys/dev/netif/axe/if_axereg.h        |  4 ++--
 sys/dev/netif/cm/smc90cx6.c          |  6 ++---
 sys/dev/netif/cue/if_cue.c           | 16 ++++++-------
 sys/dev/netif/cue/if_cuereg.h        |  4 ++--
 sys/dev/netif/cx/cx.c                | 20 ++++++++--------
 sys/dev/netif/de/if_de.c             |  4 ++--
 sys/dev/netif/em/if_em.c             | 28 +++++++++++-----------
 sys/dev/netif/en_pci/if_en_pci.c     |  6 ++---
 sys/dev/netif/fpa/if_fpa.c           | 12 +++++-----
 sys/dev/netif/fxp/if_fxp.c           |  6 ++---
 sys/dev/netif/fxp/if_fxpvar.h        |  4 ++--
 sys/dev/netif/gx/if_gxvar.h          |  4 ++--
 sys/dev/netif/kue/if_kue.c           | 16 ++++++-------
 sys/dev/netif/kue/if_kuereg.h        |  4 ++--
 sys/dev/netif/pdq_layer/pdq.c        |  4 ++--
 sys/dev/netif/pdq_layer/pdq_ifsubr.c |  8 +++----
 sys/dev/netif/pdq_layer/pdqvar.h     | 16 ++++++-------
 sys/dev/netif/sr/if_sr.c             |  4 ++--
 sys/dev/netif/tx/if_tx.c             |  4 ++--
 sys/dev/netif/wi/if_wi.c             | 10 ++++----
 sys/dev/netif/wi/if_wivar.h          |  6 ++---
 sys/dev/netif/wi/wi_hostap.c         |  4 ++--
 sys/dev/netif/wl/if_wl.c             |  8 +++----
 28 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/sys/dev/netif/awi/am79c930.c b/sys/dev/netif/awi/am79c930.c
index 0f669eeb15..23ea70a959 100644
--- a/sys/dev/netif/awi/am79c930.c
+++ b/sys/dev/netif/awi/am79c930.c
@@ -1,6 +1,6 @@
 /* $NetBSD: am79c930.c,v 1.5 2000/03/23 13:57:58 onoe Exp $ */
 /* $FreeBSD: src/sys/dev/awi/am79c930.c,v 1.2.2.1 2000/12/07 04:09:39 imp Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/am79c930.c,v 1.4 2003/08/27 09:38:29 rob Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/am79c930.c,v 1.5 2004/02/13 02:44:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,12 +64,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#ifndef __FreeBSD__
+#if !defined(__DragonFly__) && !defined(__FreeBSD__)
 #include <sys/device.h>
 #endif
 
 #include <machine/cpu.h>
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #endif
@@ -82,7 +82,7 @@
 #include <dev/ic/am79c930reg.h>
 #include <dev/ic/am79c930var.h>
 #endif
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "am79c930reg.h"
 #include "am79c930var.h"
 #endif
diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c
index f8cb5dac33..c447b1a805 100644
--- a/sys/dev/netif/awi/awi.c
+++ b/sys/dev/netif/awi/awi.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.8 2003/11/20 22:07:26 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.9 2004/02/13 02:44:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -87,9 +87,9 @@
  */
 
 #include "opt_inet.h"
-#if defined(__FreeBSD__) && __FreeBSD__ >= 4
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 4)
 #define	NBPFILTER	1
-#elif defined(__FreeBSD__) && __FreeBSD__ >= 3
+#elif defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3)
 #include "use_bpf.h"
 #define	NBPFILTER	NBPF
 #else
@@ -106,7 +106,7 @@
 #include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 4
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 4)
 #include <sys/bus.h>
 #else
 #include <sys/device.h>
@@ -114,7 +114,7 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <net/ethernet.h>
 #else
 #include <net/if_ether.h>
@@ -145,7 +145,7 @@
 #ifdef __NetBSD__
 #include <machine/intr.h>
 #endif
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <machine/clock.h>
 #endif
 
@@ -155,7 +155,7 @@
 #include <dev/ic/awireg.h>
 #include <dev/ic/awivar.h>
 #endif
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "am79c930reg.h"
 #include "am79c930var.h"
 #include "awireg.h"
@@ -220,7 +220,7 @@ int awi_dump_len = 28;
 #if NBPFILTER > 0
 #define	AWI_BPF_NORM	0
 #define	AWI_BPF_RAW	1
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define	AWI_BPF_MTAP(sc, m, raw) do {					\
 	if ((sc)->sc_ifp->if_bpf && (sc)->sc_rawbpf == (raw))		\
 		bpf_mtap((sc)->sc_ifp, (m));				\
@@ -239,8 +239,8 @@ int awi_dump_len = 28;
 #define llc_snap              llc_un.type_snap
 #endif
 
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 4
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+#if defined(__DragonFly__) || __FreeBSD__ >= 4
 devclass_t awi_devclass;
 #endif
 
@@ -308,7 +308,7 @@ awi_attach(sc)
 #ifdef __NetBSD__
 	memcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
 #endif
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 	ifp->if_output = ether_output;
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	memcpy(sc->sc_ec.ac_enaddr, sc->sc_mib_addr.aMAC_Address,
@@ -321,7 +321,7 @@ awi_attach(sc)
 	    sc->sc_tx_rate / 10, sc->sc_banner);
 	printf("%s: address %s\n",
 	    sc->sc_dev.dv_xname,  ether_sprintf(sc->sc_mib_addr.aMAC_Address));
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
 #else
 	if_attach(ifp);
@@ -498,7 +498,7 @@ awi_ioctl(ifp, cmd, data)
 
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 		error = ENETRESET;	/*XXX*/
 #else
 		error = (cmd == SIOCADDMULTI) ?
@@ -522,7 +522,7 @@ awi_ioctl(ifp, cmd, data)
 			ifp->if_mtu = ifr->ifr_mtu;
 		break;
 	case SIOCS80211NWID:
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 		error = suser(td);	/* EPERM if no proc */
 		if (error)
 			break;
@@ -556,7 +556,7 @@ awi_ioctl(ifp, cmd, data)
 		error = copyout(p + 1, ifr->ifr_data, 1 + IEEE80211_NWID_LEN);
 		break;
 	case SIOCS80211NWKEY:
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 		error = suser(td);	/* EPERM if no proc */
 		if (error)
 			break;
@@ -778,7 +778,7 @@ awi_init(sc)
 	int error, ostatus;
 	int n;
 	struct ifnet *ifp = sc->sc_ifp;
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 	struct ifmultiaddr *ifma;
 #else
 	struct ether_multi *enm;
@@ -794,7 +794,7 @@ awi_init(sc)
 		goto set_mib;
 	}
 	sc->sc_mib_mac.aPromiscuous_Enable = 0;
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 	if (ifp->if_amcount != 0)
 		goto set_mib;
 	for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma != NULL;
@@ -1267,7 +1267,7 @@ awi_input(sc, m, rxts, rssi)
 			break;
 		}
 		ifp->if_ipackets++;
-#if !(defined(__FreeBSD__) && __FreeBSD__ >= 4)
+#if !(defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 4))
 		AWI_BPF_MTAP(sc, m, AWI_BPF_NORM);
 #endif
 #ifdef __NetBSD__
diff --git a/sys/dev/netif/awi/awi_wep.c b/sys/dev/netif/awi/awi_wep.c
index 88e4e39b1d..204092ac84 100644
--- a/sys/dev/netif/awi/awi_wep.c
+++ b/sys/dev/netif/awi/awi_wep.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.3.2.2 2003/01/23 21:06:42 sam Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.6 2003/08/27 09:38:30 rob Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.7 2004/02/13 02:44:47 joerg Exp $ */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 4
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 4)
 #include <sys/bus.h>
 #else
 #include <sys/device.h>
@@ -68,7 +68,7 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #else
@@ -79,7 +79,7 @@
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <machine/clock.h>
 #endif
 
@@ -92,7 +92,7 @@
 #include <crypto/arc4/arc4.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "am79c930reg.h"
 #include "am79c930var.h"
 #include "awireg.h"
@@ -190,7 +190,7 @@ awi_wep_getnwkey(sc, nwkey)
 	nwkey->i_wepon = awi_wep_getalgo(sc);
 	nwkey->i_defkid = sc->sc_wep_defkid + 1;
 	/* do not show any keys to non-root user */
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 	suerr = suser(curthread);	/* note: EPERM if no proc */
 #else
 	suerr = suser(curproc->p_ucred, &curproc->p_acflag);
diff --git a/sys/dev/netif/awi/awi_wicfg.c b/sys/dev/netif/awi/awi_wicfg.c
index cd213ca61f..0bb26a208f 100644
--- a/sys/dev/netif/awi/awi_wicfg.c
+++ b/sys/dev/netif/awi/awi_wicfg.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi_wicfg.c,v 1.3 2000/07/06 17:22:25 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.3.2.2 2002/06/18 08:06:15 jhay Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wicfg.c,v 1.6 2003/08/27 09:38:30 rob Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wicfg.c,v 1.7 2004/02/13 02:44:47 joerg Exp $ */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/sockio.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 4
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 4)
 #include <sys/bus.h>
 #else
 #include <sys/device.h>
@@ -59,7 +59,7 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #else
@@ -70,7 +70,7 @@
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <machine/clock.h>
 #endif
 
@@ -82,7 +82,7 @@
 
 #include <dev/pcmcia/if_wi_ieee.h>	/* XXX */
 #endif
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "am79c930reg.h"
 #include "am79c930var.h"
 
@@ -110,7 +110,7 @@ awi_wicfg(ifp, cmd, data)
 		error = awi_cfgget(ifp, cmd, data);
 		break;
 	case SIOCSWAVELAN:
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 		error = suser(td);	/* note: EPERM if no proc */
 #else
 		error = suser(curproc->p_ucred, &curproc->p_acflag);
@@ -275,7 +275,7 @@ awi_cfgget(ifp, cmd, data)
 	case WI_RID_DEFLT_CRYPT_KEYS:
 		keys = (struct wi_ltv_keys *)&wreq;
 		/* do not show keys to non-root user */
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 		error = suser(td);	/* note: EPERM if no proc */
 #else
 		error = suser(curproc->p_ucred, &curproc->p_acflag);
diff --git a/sys/dev/netif/awi/awivar.h b/sys/dev/netif/awi/awivar.h
index ae9c9af622..0058add15a 100644
--- a/sys/dev/netif/awi/awivar.h
+++ b/sys/dev/netif/awi/awivar.h
@@ -1,6 +1,6 @@
 /* $NetBSD: awivar.h,v 1.12 2000/07/21 04:48:56 onoe Exp $ */
 /* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.6.2.1 2000/12/07 04:09:39 imp Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awivar.h,v 1.3 2003/08/27 09:38:30 rob Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awivar.h,v 1.4 2004/02/13 02:44:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -95,8 +95,8 @@ struct awi_softc
 	struct ethercom		sc_ec;
 	void			*sc_ih; /* interrupt handler */
 #endif
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 4
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+#if defined(__DragonFly__) || __FreeBSD__ >= 4
 	struct {
 		char	dv_xname[64];	/*XXX*/
 	}			sc_dev;
diff --git a/sys/dev/netif/axe/if_axereg.h b/sys/dev/netif/axe/if_axereg.h
index 76e5793b97..aff08c719c 100644
--- a/sys/dev/netif/axe/if_axereg.h
+++ b/sys/dev/netif/axe/if_axereg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.2 2003/06/15 21:45:43 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/axe/if_axereg.h,v 1.1 2003/12/30 01:01:46 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/axe/if_axereg.h,v 1.2 2004/02/13 02:44:47 joerg Exp $
  */
 
 /*
@@ -145,7 +145,7 @@ struct axe_cdata {
 #define AXE_INC(x, y)		(x) = (x + 1) % y
 
 struct axe_softc {
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define GET_MII(sc) (device_get_softc((sc)->axe_miibus))
 #elif defined(__NetBSD__)
 #define GET_MII(sc) (&(sc)->axe_mii)
diff --git a/sys/dev/netif/cm/smc90cx6.c b/sys/dev/netif/cm/smc90cx6.c
index ff58bbda6e..07bb8f53ea 100644
--- a/sys/dev/netif/cm/smc90cx6.c
+++ b/sys/dev/netif/cm/smc90cx6.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 /*	$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.1.2.3 2003/02/05 18:42:14 fjoe Exp $ */
-/*	$DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.6 2004/01/06 03:17:22 dillon Exp $ */
+/*	$DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.7 2004/02/13 02:44:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
 #include <sys/rman.h>
 #include <machine/resource.h>
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 #include <machine/clock.h>
 #endif
 
@@ -332,7 +332,7 @@ cm_attach(dev)
 		(void (*) (void *))cm_start, ifp);
 #endif
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 	callout_init(&sc->sc_recon_ch);
 #else
 	callout_init(&sc->sc_recon_ch, 0);
diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c
index 2d41bc646c..f5a8f2e60a 100644
--- a/sys/dev/netif/cue/if_cue.c
+++ b/sys/dev/netif/cue/if_cue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $
- * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.5 2003/12/30 01:01:46 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.6 2004/02/13 02:44:47 joerg Exp $
  *
  */
 
@@ -69,7 +69,7 @@
 
 #include <sys/bus.h>
 #include <machine/bus.h>
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 #include <machine/clock.h>
 #endif
 
@@ -369,7 +369,7 @@ cue_setmulti(struct cue_softc *sc)
 		sc->cue_mctab[i] = 0;
 
 	/* now program new ones */
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
 #else
 	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
@@ -386,7 +386,7 @@ cue_setmulti(struct cue_softc *sc)
 	 * so we can receive broadcast frames.
  	 */
 	if (ifp->if_flags & IFF_BROADCAST) {
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 		h = cue_mchash(ifp->if_broadcastaddr);
 #else
 		h = cue_mchash(etherbroadcastaddr);
@@ -497,7 +497,7 @@ USB_ATTACH(cue)
 		}
 	}
 
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
 #endif
@@ -538,7 +538,7 @@ USB_ATTACH(cue)
 	/*
 	 * Call MI attach routine.
 	 */
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	ether_ifattach(ifp, eaddr);
 #else
 	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
@@ -563,7 +563,7 @@ cue_detach(device_ptr_t dev)
 
 	sc->cue_dying = 1;
 	untimeout(cue_tick, sc, sc->cue_stat_ch);
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	ether_ifdetach(ifp);
 #else
 	ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
@@ -577,7 +577,7 @@ cue_detach(device_ptr_t dev)
 		usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
 
 	CUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	mtx_destroy(&sc->cue_mtx);
 #endif
 
diff --git a/sys/dev/netif/cue/if_cuereg.h b/sys/dev/netif/cue/if_cuereg.h
index f5d9380a63..6ea3dc8d9b 100644
--- a/sys/dev/netif/cue/if_cuereg.h
+++ b/sys/dev/netif/cue/if_cuereg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.12 2003/10/04 21:41:01 joe Exp $
- * $DragonFly: src/sys/dev/netif/cue/if_cuereg.h,v 1.3 2003/12/30 01:01:46 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cue/if_cuereg.h,v 1.4 2004/02/13 02:44:47 joerg Exp $
  */
 
 /*
@@ -178,7 +178,7 @@ struct cue_softc {
 	u_int16_t		cue_rxfilt;
 	struct cue_cdata	cue_cdata;
 	struct callout_handle	cue_stat_ch;
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	struct mtx		cue_mtx;
 #endif
 	char			cue_dying;
diff --git a/sys/dev/netif/cx/cx.c b/sys/dev/netif/cx/cx.c
index 1a836f851a..1d8356fc23 100644
--- a/sys/dev/netif/cx/cx.c
+++ b/sys/dev/netif/cx/cx.c
@@ -16,7 +16,7 @@
  * Version 1.9, Wed Oct  4 18:58:15 MSK 1995
  *
  * $FreeBSD: src/sys/i386/isa/cx.c,v 1.45.2.1 2001/02/26 04:23:09 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/cx/cx.c,v 1.8 2004/01/06 03:17:22 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cx/cx.c,v 1.9 2004/02/13 02:44:47 joerg Exp $
  *
  */
 #undef DEBUG
@@ -33,8 +33,8 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef __FreeBSD__
-#   if __FreeBSD__ < 2
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+#   if defined(__FreeBSD__) && __FreeBSD__ < 2
 #      include <machine/pio.h>
 #      define RB_GETC(q) getc(q)
 #   endif
@@ -45,7 +45,7 @@
 #   define tsleep(tp,pri,msg,x) ((tp)->t_state |= TS_WOPEN,\
 		ttysleep (tp, (caddr_t)&tp->t_rawq, pri, msg, x))
 #endif
-#if !defined (__FreeBSD__) || __FreeBSD__ >= 2
+#if defined(__DragonFly__) || !defined (__FreeBSD__) || __FreeBSD__ >= 2
 #      define t_out t_outq
 #      define RB_LEN(q) ((q).c_cc)
 #      define RB_GETC(q) getc(&q)
@@ -80,7 +80,7 @@ timeout_t cxtimeout;
 
 extern cx_board_t cxboard [NCX];        /* adapter state structures */
 extern cx_chan_t *cxchan [NCX*NCHAN];   /* unit to channel struct pointer */
-#if __FreeBSD__ >= 2
+#if defined(__DragonFly__) || __FreeBSD__ >= 2
 static struct tty cx_tty [NCX*NCHAN];          /* tty data */
 
 static	d_open_t	cxopen;
@@ -135,8 +135,8 @@ int cxopen (dev_t dev, int flag, int mode, struct thread *td)
 	if (c->mode != M_ASYNC)
 		return (EBUSY);
 	if (! c->ttyp) {
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 2
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+#if defined(__DragonFly__) || __FreeBSD__ >= 2
 		c->ttyp = &cx_tty[unit];
 #else
 		c->ttyp = cx_tty[unit] = ttymalloc (cx_tty[unit]);
@@ -244,7 +244,7 @@ int cxopen (dev_t dev, int flag, int mode, struct thread *td)
 	spl0 ();
 	if (error)
 		return (error);
-#if __FreeBSD__ >= 2
+#if defined(__DragonFly__) || __FreeBSD__ >= 2
 	error = (*linesw[tp->t_line].l_open) (dev, tp);
 #else
 	error = (*linesw[tp->t_line].l_open) (dev, tp, 0);
@@ -422,7 +422,7 @@ int cxioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	tp = c->ttyp;
 	if (! tp)
 		return (EINVAL);
-#if __FreeBSD__ >= 2
+#if defined(__DragonFly__) || __FreeBSD__ >= 2
 	error = (*linesw[tp->t_line].l_ioctl) (tp, cmd, data, flag, td);
 #else
 	error = (*linesw[tp->t_line].l_ioctl) (tp, cmd, data, flag);
@@ -945,7 +945,7 @@ void cxtimeout (void *a)
 }
 
 
-#if defined(__FreeBSD__) && (__FreeBSD__ > 1 )
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && (__FreeBSD__ > 1 ))
 static void 	cx_drvinit(void *unused)
 {
 
diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index 2d54be0905..37a323ff3f 100644
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $	*/
 
 /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */
-/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.6 2003/11/20 22:07:27 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.7 2004/02/13 02:44:47 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -3471,7 +3471,7 @@ tulip_rx_intr(
 #endif /* TULIP_BUS_DMA */
 
 	    eh = *mtod(ms, struct ether_header *);
-#ifndef __FreeBSD__
+#if !defined(__DragonFly__) && !defined(__FreeBSD__)
 	    if (sc->tulip_if.if_bpf != NULL) {
 		if (me == ms)
 		    bpf_tap(&sc->tulip_if, mtod(ms, caddr_t), total_len);
diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index 2d4db3d1e8..bfdc2c2da7 100644
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/
-/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.5 2004/01/06 01:40:47 dillon Exp $*/
+/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.6 2004/02/13 02:44:47 joerg Exp $*/
 
 #include "if_em.h"
 
@@ -469,7 +469,7 @@ em_detach(device_t dev)
 
 	em_stop(adapter);
 	em_phy_hw_reset(&adapter->hw);
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         ether_ifdetach(&adapter->interface_data.ac_if, ETHER_BPF_SUPPORTED);
 #else
         ether_ifdetach(&adapter->interface_data.ac_if);
@@ -561,7 +561,7 @@ em_start(struct ifnet *ifp)
                 }
 
 		/* Send a copy of the frame to the BPF listener */
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
                 if (ifp->if_bpf)
                         bpf_mtap(ifp, m_head);
 #else
@@ -924,7 +924,7 @@ em_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
 			ifmr->ifm_active |= IFM_100_TX;
 			break;
 		case 1000:
-#if __FreeBSD_version < 500000 
+#if defined(__DragonFly__) || __FreeBSD_version < 500000 
 			ifmr->ifm_active |= IFM_1000_TX;
 #else
 			ifmr->ifm_active |= IFM_1000_T;
@@ -964,7 +964,7 @@ em_media_change(struct ifnet *ifp)
 		adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;
 		break;
 	case IFM_1000_SX:
-#if __FreeBSD_version < 500000 
+#if defined(__DragonFly__) || __FreeBSD_version < 500000 
 	case IFM_1000_TX:
 #else
 	case IFM_1000_T:
@@ -1017,7 +1017,7 @@ em_encap(struct adapter *adapter, struct mbuf *m_head)
         int             txd_used, i, txd_saved;
         struct mbuf     *mp;
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         struct ifvlan *ifv = NULL;
 #else
         struct m_tag    *mtag;
@@ -1047,7 +1047,7 @@ em_encap(struct adapter *adapter, struct mbuf *m_head)
 
 
         /* Find out if we are in vlan mode */
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         if ((m_head->m_flags & (M_PROTO1|M_PKTHDR)) == (M_PROTO1|M_PKTHDR) &&
             m_head->m_pkthdr.rcvif != NULL &&
             m_head->m_pkthdr.rcvif->if_type == IFT_L2VLAN)
@@ -1088,7 +1088,7 @@ em_encap(struct adapter *adapter, struct mbuf *m_head)
 	adapter->num_tx_desc_avail -= txd_used;
 	adapter->next_avail_tx_desc = i;
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         if (ifv != NULL) {
                 /* Set the vlan id */
                 current_tx_desc->upper.fields.special = ifv->ifv_tag;
@@ -1316,7 +1316,7 @@ em_set_multi(struct adapter * adapter)
                 msec_delay(5);
         }
         
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 #else
         TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
@@ -1647,7 +1647,7 @@ em_setup_interface(device_t dev, struct adapter * adapter)
 	ifp->if_watchdog = em_watchdog;
 	ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 1;
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
 #else
         ether_ifattach(ifp, adapter->interface_data.ac_enaddr);
@@ -1662,7 +1662,7 @@ em_setup_interface(device_t dev, struct adapter * adapter)
          * Tell the upper layer(s) we support long frames.
          */
         ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
         ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU;
 #endif
 
@@ -1686,7 +1686,7 @@ em_setup_interface(device_t dev, struct adapter * adapter)
 			    0, NULL);
 		ifmedia_add(&adapter->media, IFM_ETHER | IFM_100_TX | IFM_FDX, 
 			    0, NULL);
-#if __FreeBSD_version < 500000 
+#if defined(__DragonFly__) || __FreeBSD_version < 500000 
 		ifmedia_add(&adapter->media, IFM_ETHER | IFM_1000_TX | IFM_FDX, 
 			    0, NULL);
 		ifmedia_add(&adapter->media, IFM_ETHER | IFM_1000_TX, 0, NULL);
@@ -2294,7 +2294,7 @@ em_process_receive_interrupts(struct adapter * adapter, int count)
 {
 	struct ifnet        *ifp;
 	struct mbuf         *mp;
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
         struct ether_header *eh;
 #endif
 	u_int8_t            accept_frame = 0;
@@ -2385,7 +2385,7 @@ em_process_receive_interrupts(struct adapter * adapter, int count)
                                 adapter->fmp->m_pkthdr.rcvif = ifp;
 				ifp->if_ipackets++;
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
                                 eh = mtod(adapter->fmp, struct ether_header *);
                                 /* Remove ethernet header from mbuf */
                                 m_adj(adapter->fmp, sizeof(struct ether_header));
diff --git a/sys/dev/netif/en_pci/if_en_pci.c b/sys/dev/netif/en_pci/if_en_pci.c
index a5121a473c..0381dc9317 100644
--- a/sys/dev/netif/en_pci/if_en_pci.c
+++ b/sys/dev/netif/en_pci/if_en_pci.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_en_pci.c,v 1.12 1999/08/21 22:10:49 msmith Exp $
- * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.7 2004/02/13 02:44:47 joerg Exp $
  */
 
 /*
@@ -51,7 +51,7 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <sys/eventhandler.h>
 #endif
 #include <sys/malloc.h>
@@ -320,7 +320,7 @@ en_pci_shutdown(
 
 #if !defined(MIDWAY_ENIONLY)
 
-#if defined(sparc) || defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(sparc) || defined(__FreeBSD__)
 #define bus_space_read_1(t, h, o) \
   		((void)t, (*(volatile u_int8_t *)((h) + (o))))
 #endif
diff --git a/sys/dev/netif/fpa/if_fpa.c b/sys/dev/netif/fpa/if_fpa.c
index 8b9aa16d9a..c487ead0d6 100644
--- a/sys/dev/netif/fpa/if_fpa.c
+++ b/sys/dev/netif/fpa/if_fpa.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.13 1999/08/28 00:50:50 peter Exp $
- * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.6 2004/01/06 03:17:23 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.7 2004/02/13 02:44:48 joerg Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 
 #include <net/if.h>
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "use_fpa.h"
 #include <sys/eventhandler.h>
 #include <net/ethernet.h>
@@ -76,7 +76,7 @@
 #define	PCI_CBMA	0x10	/* Configuration Base Memory Address */
 #define	PCI_CBIO	0x14	/* Configuration Base I/O Address */
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #if NFPA < 4
 #undef NFPA
 #define NFPA	4
@@ -107,7 +107,7 @@ pdq_pci_ifwatchdog(
 }
 #endif
 
-#if defined(__FreeBSD__) && BSD >= 199506
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && BSD >= 199506)
 static void
 pdq_pci_ifintr(
     void *arg)
@@ -120,7 +120,7 @@ pdq_pci_ifintr(
     void *arg)
 {
     pdq_softc_t * const sc = (pdq_softc_t *) arg;
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
     return pdq_interrupt(sc->sc_pdq);
 #elif defined(__bsdi__) || defined(__NetBSD__)
     (void) pdq_interrupt(sc->sc_pdq);
@@ -129,7 +129,7 @@ pdq_pci_ifintr(
 }
 #endif /* __FreeBSD && BSD */
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 static void pdq_pci_shutdown(void *, int);
 
 /*
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 1077913bf4..a5f8413ee6 100644
--- a/sys/dev/netif/fxp/if_fxp.c
+++ b/sys/dev/netif/fxp/if_fxp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $
- * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.6 2004/01/06 01:40:47 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.7 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -356,7 +356,7 @@ fxp_probe(device_t dev)
 static void
 fxp_powerstate_d0(device_t dev)
 {
-#if __FreeBSD_version >= 430002
+#if defined(__DragonFly__) || __FreeBSD_version >= 430002
 	u_int32_t iobase, membase, irq;
 
 	if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
@@ -2072,7 +2072,7 @@ fxp_mc_addrs(struct fxp_softc *sc)
 
 	nmcasts = 0;
 	if ((sc->flags & FXP_FLAG_ALL_MCAST) == 0) {
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 		LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 #else
 		TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
diff --git a/sys/dev/netif/fxp/if_fxpvar.h b/sys/dev/netif/fxp/if_fxpvar.h
index 4bb6282911..91ecaf5482 100644
--- a/sys/dev/netif/fxp/if_fxpvar.h
+++ b/sys/dev/netif/fxp/if_fxpvar.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.17.2.6 2002/11/13 20:58:31 iedowse Exp $
- * $DragonFly: src/sys/dev/netif/fxp/if_fxpvar.h,v 1.3 2004/01/06 03:17:23 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxpvar.h,v 1.4 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -89,7 +89,7 @@
  */
 #define TUNABLE_BUNDLE_MAX 6
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 #define	FXP_LOCK(_sc)
 #define	FXP_UNLOCK(_sc)
 #define mtx_init(a, b, c)
diff --git a/sys/dev/netif/gx/if_gxvar.h b/sys/dev/netif/gx/if_gxvar.h
index 3844c1e4f8..3c45e9ca46 100644
--- a/sys/dev/netif/gx/if_gxvar.h
+++ b/sys/dev/netif/gx/if_gxvar.h
@@ -27,10 +27,10 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/gx/if_gxvar.h,v 1.1.2.1 2001/11/15 03:09:23 jlemon Exp $
- *	$DragonFly: src/sys/dev/netif/gx/Attic/if_gxvar.h,v 1.2 2003/06/17 04:28:26 dillon Exp $
+ *	$DragonFly: src/sys/dev/netif/gx/Attic/if_gxvar.h,v 1.3 2004/02/13 02:44:48 joerg Exp $
  */
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 #define GX_LOCK(gx)		
 #define GX_UNLOCK(gx)		
 #define mtx_init(a, b, c)
diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c
index 75e91b604f..ea32197fe3 100644
--- a/sys/dev/netif/kue/if_kue.c
+++ b/sys/dev/netif/kue/if_kue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  *  $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $
- * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.5 2003/12/30 01:01:46 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.6 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -83,7 +83,7 @@
 
 #include <sys/bus.h>
 #include <machine/bus.h>
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 #include <machine/clock.h>
 #endif
 
@@ -331,7 +331,7 @@ kue_setmulti(struct kue_softc *sc)
 
 	sc->kue_rxfilt &= ~KUE_RXFILT_ALLMULTI;
 
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
 #else
 	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
@@ -451,7 +451,7 @@ USB_ATTACH(kue)
 		}
 	}
 
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
 #endif
@@ -460,7 +460,7 @@ USB_ATTACH(kue)
 	/* Load the firmware into the NIC. */
 	if (kue_load_fw(sc)) {
 		KUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 		mtx_destroy(&sc->kue_mtx);
 #endif
 		USB_ATTACH_ERROR_RETURN;
@@ -504,7 +504,7 @@ USB_ATTACH(kue)
 	/*
 	 * Call MI attach routine.
 	 */
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	ether_ifattach(ifp, sc->kue_desc.kue_macaddr);
 #else
 	ether_ifattach(ifp, ETHER_BPF_SUPPORTED);
@@ -530,7 +530,7 @@ kue_detach(device_ptr_t dev)
 	sc->kue_dying = 1;
 
 	if (ifp != NULL)
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 		ether_ifdetach(ifp);
 #else
 		ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
@@ -547,7 +547,7 @@ kue_detach(device_ptr_t dev)
 		free(sc->kue_mcfilters, M_USBDEV);
 
 	KUE_UNLOCK(sc);
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	mtx_destroy(&sc->kue_mtx);
 #endif
 
diff --git a/sys/dev/netif/kue/if_kuereg.h b/sys/dev/netif/kue/if_kuereg.h
index f2f62306bf..e06f0df43a 100644
--- a/sys/dev/netif/kue/if_kuereg.h
+++ b/sys/dev/netif/kue/if_kuereg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.13 2003/10/04 21:41:01 joe Exp $
- * $DragonFly: src/sys/dev/netif/kue/if_kuereg.h,v 1.3 2003/12/30 01:01:46 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/kue/if_kuereg.h,v 1.4 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -170,7 +170,7 @@ struct kue_softc {
 	u_int16_t		kue_rxfilt;
 	u_int8_t		*kue_mcfilters;
 	struct kue_cdata	kue_cdata;
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	struct mtx		kue_mtx;
 #endif
 	char			kue_dying;
diff --git a/sys/dev/netif/pdq_layer/pdq.c b/sys/dev/netif/pdq_layer/pdq.c
index 0b757c6537..da96509f10 100644
--- a/sys/dev/netif/pdq_layer/pdq.c
+++ b/sys/dev/netif/pdq_layer/pdq.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/pdq.c,v 1.5 1999/08/28 00:42:19 peter Exp $
- * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq.c,v 1.3 2003/08/07 21:17:04 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq.c,v 1.4 2004/02/13 02:44:48 joerg Exp $
  *
  */
 
@@ -40,7 +40,7 @@
 
 #define	PDQ_HWSUPPORT	/* for pdq.h */
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "pdqvar.h"
 #include "pdqreg.h"
 #else
diff --git a/sys/dev/netif/pdq_layer/pdq_ifsubr.c b/sys/dev/netif/pdq_layer/pdq_ifsubr.c
index b090c18e69..ef2722d2c6 100644
--- a/sys/dev/netif/pdq_layer/pdq_ifsubr.c
+++ b/sys/dev/netif/pdq_layer/pdq_ifsubr.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.11.2.1 2000/08/02 22:39:30 peter Exp $
- * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq_ifsubr.c,v 1.4 2003/08/07 21:17:04 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq_ifsubr.c,v 1.5 2004/02/13 02:44:48 joerg Exp $
  *
  */
 
@@ -48,7 +48,7 @@
 
 #include <net/bpf.h>
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -67,7 +67,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include "pdqvar.h"
 #include "pdqreg.h"
 #else
@@ -365,7 +365,7 @@ pdq_ifattach(
 
     ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
 
-#if (defined(__FreeBSD__) && BSD >= 199506) || defined(__NetBSD__)
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && BSD >= 199506) || defined(__NetBSD__)
     ifp->if_watchdog = pdq_ifwatchdog;
 #else
     ifp->if_watchdog = ifwatchdog;
diff --git a/sys/dev/netif/pdq_layer/pdqvar.h b/sys/dev/netif/pdq_layer/pdqvar.h
index 750639f7d2..4346e5e5d8 100644
--- a/sys/dev/netif/pdq_layer/pdqvar.h
+++ b/sys/dev/netif/pdq_layer/pdqvar.h
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.3.2.1 2002/05/14 21:02:11 gallatin Exp $
- * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdqvar.h,v 1.2 2003/06/17 04:28:29 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdqvar.h,v 1.3 2004/02/13 02:44:48 joerg Exp $
  *
  */
 
@@ -59,7 +59,7 @@ enum _pdq_type_t {
 
 #if defined(PDQTEST)
 #include <pdq_os_test.h>
-#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__)
+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,7 +78,7 @@ enum _pdq_type_t {
 #define	PDQ_OS_PREFIX			"%s%d: "
 #define	PDQ_OS_PREFIX_ARGS		pdq->pdq_os_name, pdq->pdq_unit
 #endif
-#if defined(__FreeBSD__) && BSD >= 199506
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && BSD >= 199506)
 #define	PDQ_OS_PAGESIZE			PAGE_SIZE
 #else
 #define	PDQ_OS_PAGESIZE			NBPG
@@ -87,14 +87,14 @@ enum _pdq_type_t {
 #define	PDQ_OS_MEMZERO(p, n)		bzero((caddr_t)(p), (n))
 #if defined(__NetBSD__) && defined(__alpha__)
 #define	PDQ_OS_VA_TO_PA(pdq, p)		(vtophys((vm_offset_t)p) | (pdq->pdq_type == PDQ_DEFTA ? 0 : 0x40000000))
-#elif defined(__FreeBSD__) && defined(__alpha__)
+#elif (defined(__DragonFly__) || defined(__FreeBSD__)) && defined(__alpha__)
 #define	PDQ_OS_VA_TO_PA(pdq, p)		(vtophys((vm_offset_t)p) | (pdq->pdq_type == PDQ_DEFTA ? 0 : alpha_XXX_dmamap_or))
 #else
 #define	PDQ_OS_VA_TO_PA(pdq, p)		vtophys(p)
 #endif
 #define	PDQ_OS_MEMALLOC(n)		malloc(n, M_DEVBUF, M_NOWAIT)
 #define	PDQ_OS_MEMFREE(p, n)		free((void *) p, M_DEVBUF)
-#ifdef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define	PDQ_OS_MEMALLOC_CONTIG(n)	vm_page_alloc_contig(n, 0, 0xffffffff, PAGE_SIZE)
 #define	PDQ_OS_MEMFREE_CONTIG(p, n)	kmem_free(kernel_map, (vm_offset_t) p, n)
 #else
@@ -102,7 +102,7 @@ enum _pdq_type_t {
 #define	PDQ_OS_MEMFREE_CONTIG(p, n)	kmem_free(kernel_map, (vm_offset_t) p, n)
 #endif /* __FreeBSD__ */
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <machine/bus.h>
@@ -114,7 +114,7 @@ typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t;
 typedef	u_int16_t pdq_bus_ioport_t;
 typedef volatile pdq_uint32_t *pdq_bus_memaddr_t;
 typedef pdq_bus_memaddr_t pdq_bus_memoffset_t;
-#if BSD >= 199506	/* __FreeBSD__ */
+#if defined(__DragonFly__) || BSD >= 199506	/* __FreeBSD__ */
 #define	PDQ_BPF_MTAP(sc, m)	bpf_mtap(&(sc)->sc_if, m)
 #define	PDQ_BPFATTACH(sc, t, s)	bpfattach(&(sc)->sc_if, t, s)
 #endif
@@ -204,7 +204,7 @@ typedef struct {
     struct device sc_dev;		/* base device */
     void *sc_ih;			/* interrupt vectoring */
     void *sc_ats;			/* shutdown hook */
-#elif defined(__FreeBSD__)
+#elif defined(__DragonFly__) || defined(__FreeBSD__)
     struct kern_devconf *sc_kdc;	/* freebsd cruft */
 #endif
     struct arpcom sc_ac;
diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c
index 903c3fb959..cde41a8905 100644
--- a/sys/dev/netif/sr/if_sr.c
+++ b/sys/dev/netif/sr/if_sr.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $
- * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.6 2004/01/06 01:40:49 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.7 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -153,7 +153,7 @@ struct sr_softc {
 #define	SCF_RUNNING	0x01		/* board is active */
 #define	SCF_OACTIVE	0x02		/* output is active */
 	int		out_dog;	/* watchdog cycles output count-down */
-#if ( __FreeBSD__ >= 3 )
+#if defined(__DragonFly__) || ( __FreeBSD__ >= 3 )
 	struct callout_handle handle;	/* timeout(9) handle */
 #endif
 	u_long		inbytes, outbytes;	/* stats */
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 8ffb8e729f..26c91853e3 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.6 2004/01/06 01:40:49 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.7 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -1290,7 +1290,7 @@ epic_set_mc_table(sc)
 	filter[2] = 0;
 	filter[3] = 0;
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 #else
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c
index 1531e6bffd..0c92dc2166 100644
--- a/sys/dev/netif/wi/if_wi.c
+++ b/sys/dev/netif/wi/if_wi.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.7 2004/01/06 01:40:50 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.8 2004/02/13 02:44:48 joerg Exp $
  */
 
 /*
@@ -64,7 +64,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#if __FreeBSD_version >= 500033
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500033
 #include <sys/endian.h>
 #endif
 #include <sys/sockio.h>
@@ -203,7 +203,7 @@ wi_generic_detach(dev)
 	sc->wi_gone = 1;
 
 	WI_UNLOCK(sc, s);
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	mtx_destroy(&sc->wi_mtx);
 #endif
 
@@ -233,7 +233,7 @@ wi_generic_attach(device_t dev)
 		return (error);
 	}
 
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF | MTX_RECURSE);
 #endif
@@ -1505,7 +1505,7 @@ wi_setmulti(sc)
 		return;
 	}
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 	LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 #else
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
diff --git a/sys/dev/netif/wi/if_wivar.h b/sys/dev/netif/wi/if_wivar.h
index 9557fa1915..257924aabb 100644
--- a/sys/dev/netif/wi/if_wivar.h
+++ b/sys/dev/netif/wi/if_wivar.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.8.2.3 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/wi/if_wivar.h,v 1.2 2003/06/17 04:28:33 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wi/if_wivar.h,v 1.3 2004/02/13 02:44:48 joerg Exp $
  */
 
 #define WICACHE			/* turn on signal strength cache code */  
@@ -172,7 +172,7 @@ struct wi_softc	{
 	int			wi_icv_flag;
 	int			wi_ibss_port;
 	struct callout_handle	wi_stat_ch;
-#if __FreeBSD_version >= 500000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	struct mtx		wi_mtx;
 #endif
 	int			wi_nic_type;
@@ -202,7 +202,7 @@ struct wi_card_ident {
 	u_int8_t	firm_type;
 };
 
-#if __FreeBSD_version < 500000
+#if defined(__DragonFly__) || __FreeBSD_version < 500000
 /*
  * Various compat hacks/kludges
  */
diff --git a/sys/dev/netif/wi/wi_hostap.c b/sys/dev/netif/wi/wi_hostap.c
index 6febb4436a..468cdbd8bb 100644
--- a/sys/dev/netif/wi/wi_hostap.c
+++ b/sys/dev/netif/wi/wi_hostap.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/wi_hostap.c,v 1.7.2.4 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/wi/Attic/wi_hostap.c,v 1.5 2003/08/07 21:17:06 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wi/Attic/wi_hostap.c,v 1.6 2004/02/13 02:44:48 joerg Exp $
  */
 
 /* This is experimental Host AP software for Prism 2 802.11b interfaces.
@@ -41,7 +41,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#if __FreeBSD_version >= 500033
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500033
 #include <sys/endian.h>
 #endif
 #include <sys/sockio.h>
diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c
index 105cdf5506..9fb41294e9 100644
--- a/sys/dev/netif/wl/if_wl.c
+++ b/sys/dev/netif/wl/if_wl.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */
-/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.7 2004/01/06 03:17:24 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.8 2004/02/13 02:44:49 joerg Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -673,7 +673,7 @@ wlinit(void *xsc)
     if (sc->wl_if.if_flags & IFF_DEBUG)
 	printf("wl%d: entered wlinit()\n",sc->unit);
 #endif
-#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 300000)
     if (ifp->if_addrhead.tqh_first == (struct ifaddr *)0) {
 #else
     if (ifp->if_addrlist == (struct ifaddr *)0) {
@@ -1982,7 +1982,7 @@ wlconfig(int unit)
     short		base = sc->base;
 
 #if	MULTICAST
-#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 300000)
     struct ifmultiaddr *ifma;
     u_char *addrp;
 #else
@@ -2051,7 +2051,7 @@ wlconfig(int unit)
     outw(PIOP1(base), 0);				/* ac_status */
     outw(PIOP1(base), AC_MCSETUP|AC_CW_EL);		/* ac_command */
     outw(PIOR1(base), OFFSET_CU + 8);
-#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 300000)
     for (ifma = sc->wl_if.if_multiaddrs.lh_first; ifma;
 	 ifma = ifma->ifma_link.le_next) {
 	if (ifma->ifma_addr->sa_family != AF_LINK)
-- 
2.41.0