diff --git a/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
index a630a49f7f..f4d649f487 100644
--- a/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/atheros813x/glue.c
@@ -3,6 +3,6 @@
 HAIKU_FBSD_DRIVER_GLUE(atheros813x, alc, pci);
 
 HAIKU_FBSD_MII_DRIVER(ukphy);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
 NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
index 0c34288f60..9e40fa80a9 100644
--- a/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c
@@ -9,6 +9,9 @@
 
 
 HAIKU_FBSD_DRIVER_GLUE(atheros81xx, ale, pci)
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
+NO_HAIKU_REENABLE_INTERRUPTS();
 
 extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);
 
@@ -22,8 +25,3 @@ __haiku_select_miibus_driver(device_t dev)
 
 	return __haiku_probe_miibus(dev, drivers);
 }
-
-NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
-NO_HAIKU_REENABLE_INTERRUPTS();
-
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);
diff --git a/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
index 7b8bced340..7ea3341f42 100644
--- a/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/attansic_l2/glue.c
@@ -8,7 +8,10 @@
 #include <sys/bus.h>
 
 
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
 HAIKU_FBSD_DRIVER_GLUE(attansic_l2, ae, pci)
+NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
+NO_HAIKU_REENABLE_INTERRUPTS();
 
 extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);
 
@@ -22,8 +25,3 @@ __haiku_select_miibus_driver(device_t dev)
 
 	return __haiku_probe_miibus(dev, drivers);
 }
-
-NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
-NO_HAIKU_REENABLE_INTERRUPTS();
-
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);
diff --git a/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
index d30dadfc51..b7f52eb9ef 100644
--- a/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/broadcom440x/glue.c
@@ -16,12 +16,10 @@
 
 
 HAIKU_FBSD_DRIVER_GLUE(broadcom440x, bfe, pci);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 
 extern driver_t *DRIVER_MODULE_NAME(bmtphy, miibus);
 
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
-//HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);
-
 driver_t *
 __haiku_select_miibus_driver(device_t dev)
 {
@@ -40,7 +38,7 @@ __haiku_disable_interrupts(device_t dev)
 	struct bfe_softc *sc = device_get_softc(dev);
 	uint32 istat;
 	HAIKU_INTR_REGISTER_STATE;
-	
+
 	HAIKU_INTR_REGISTER_ENTER();
 
 	istat = CSR_READ_4(sc, BFE_ISTAT);
@@ -48,7 +46,7 @@ __haiku_disable_interrupts(device_t dev)
 		HAIKU_INTR_REGISTER_LEAVE();
 		return 0;
 	}
-	
+
 	CSR_WRITE_4(sc, BFE_IMASK, 0);
 	CSR_READ_4(sc, BFE_IMASK);
 
diff --git a/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
index 74e96ee89f..da9e9853d6 100644
--- a/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/broadcom570x/glue.c
@@ -18,7 +18,7 @@
 
 
 HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 
 
 extern driver_t *DRIVER_MODULE_NAME(brgphy, miibus);
@@ -44,8 +44,8 @@ __haiku_disable_interrupts(device_t dev)
 	struct bge_softc *sc = device_get_softc(dev);
 
 	uint32 notInterrupted = pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4)
-		& BGE_PCISTATE_INTR_STATE; 
-	// bit of a strange register name. a nonzero actually means 
+		& BGE_PCISTATE_INTR_STATE;
+	// bit of a strange register name. a nonzero actually means
 	// it is _not_ interrupted by the network chip
 
 	if (notInterrupted)
diff --git a/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
index 3e267cbb5d..b93a5bdbf3 100644
--- a/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/dec21xxx/glue.c
@@ -17,6 +17,10 @@
 #include "if_dcreg.h"
 
 
+HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
+
+
 int check_disable_interrupts_dc(device_t dev);
 void reenable_interrupts_dc(device_t dev);
 
@@ -24,11 +28,6 @@ extern int check_disable_interrupts_de(device_t dev);
 extern void reenable_interrupts_de(device_t dev);
 
 
-HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
-
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);
-
-
 extern driver_t *DRIVER_MODULE_NAME(dc, pci);
 extern driver_t *DRIVER_MODULE_NAME(de, pci);
 
diff --git a/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
index 48e02ee204..8ee4d5a29b 100644
--- a/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/ipro100/glue.c
@@ -19,7 +19,7 @@
 
 
 HAIKU_FBSD_DRIVER_GLUE(ipro100, fxp, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 HAIKU_FBSD_MII_DRIVER(inphy);
 
 
diff --git a/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
index a805fdc2a7..dae9b7170b 100644
--- a/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/jmicron2x0/glue.c
@@ -9,6 +9,6 @@
 HAIKU_FBSD_DRIVER_GLUE(jmicron2x0, jme, pci);
 
 HAIKU_FBSD_MII_DRIVER(jmphy);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
 NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
 NO_HAIKU_REENABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
index 07b18e8b7b..5a47c661db 100644
--- a/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/marvell_yukon/glue.c
@@ -17,7 +17,7 @@
 #include <dev/msk/if_mskreg.h>
 
 
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 HAIKU_FBSD_DRIVER_GLUE(marvell_yukon, mskc, pci)
 
 extern driver_t *DRIVER_MODULE_NAME(e1000phy, miibus);
diff --git a/src/add-ons/kernel/drivers/network/ether/nforce/glue.c b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
index 3748762828..a4b0373d8c 100644
--- a/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/nforce/glue.c
@@ -9,7 +9,7 @@
 
 HAIKU_FBSD_DRIVER_GLUE(nforce, nfe, pci)
 
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_SWI_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE);
 NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
 NO_HAIKU_REENABLE_INTERRUPTS();
 
diff --git a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
index 626c43f5ce..add5a19d62 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
@@ -23,7 +23,7 @@
 
 
 HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 NO_HAIKU_REENABLE_INTERRUPTS();
 
 
diff --git a/src/add-ons/kernel/drivers/network/ether/sis900/glue.c b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
index 9d25d83063..e97035de00 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis900/glue.c
@@ -17,7 +17,7 @@
 
 
 HAIKU_FBSD_DRIVER_GLUE(sis900, sis, pci);
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES);
 NO_HAIKU_REENABLE_INTERRUPTS();
 
 
diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c b/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
index df1ae648d5..a1cfc3b815 100644
--- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/glue.c
@@ -8,7 +8,7 @@
 
 
 HAIKU_FBSD_WLAN_DRIVER_GLUE(marvell8335, malo, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_WLAN);
 HAIKU_FIRMWARE_VERSION(0);
 
 NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
diff --git a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
index bea3bbcd9e..f0291978e1 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
@@ -26,7 +26,7 @@
 
 
 HAIKU_FBSD_WLAN_DRIVER_GLUE(ralinkwifi, ral, pci)
-HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE | FBSD_WLAN);
+HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN);
 HAIKU_FIRMWARE_VERSION(0);
 HAIKU_FIRMWARE_NAME_MAP({
 	{"rt2561fw", "rt2561.ucode"},