From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sun, 17 Aug 2008 04:32:35 +0000 (+0000)
Subject: Nuke INTR_NETSAFE
X-Git-Tag: v2.1.1~650
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/95893fe43c1a3fc4533066acd93074955c1d90ab

Nuke INTR_NETSAFE
---

diff --git a/sys/dev/netif/an/if_an_isa.c b/sys/dev/netif/an/if_an_isa.c
index 006b71d2b0..b59fb94f56 100644
--- a/sys/dev/netif/an/if_an_isa.c
+++ b/sys/dev/netif/an/if_an_isa.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.5 2003/02/01 03:25:12 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.17 2008/05/14 11:59:18 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.18 2008/08/17 04:32:32 sephe Exp $
  */
 
 /*
@@ -117,7 +117,7 @@ an_attach_isa(device_t dev)
 	if (error)
 		goto fail;
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       an_intr, sc, &sc->irq_handle, 
 			       sc->arpcom.ac_if.if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/an/if_an_pccard.c b/sys/dev/netif/an/if_an_pccard.c
index 7902fbe6e6..5f7e17112b 100644
--- a/sys/dev/netif/an/if_an_pccard.c
+++ b/sys/dev/netif/an/if_an_pccard.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.6 2003/02/01 03:25:12 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.16 2008/05/14 11:59:18 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.17 2008/08/17 04:32:32 sephe Exp $
  */
 
 /*
@@ -160,7 +160,7 @@ an_pccard_attach(device_t dev)
 	/*
 	 * Must setup the interrupt after the an_attach to prevent racing.
 	 */
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       an_intr, sc, &sc->irq_handle,
 			       sc->arpcom.ac_if.if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/an/if_an_pci.c b/sys/dev/netif/an/if_an_pci.c
index e2f95ce04f..cb1e0c1720 100644
--- a/sys/dev/netif/an/if_an_pci.c
+++ b/sys/dev/netif/an/if_an_pci.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.8 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.21 2008/05/14 11:59:18 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.22 2008/08/17 04:32:32 sephe Exp $
  */
 
 /*
@@ -204,7 +204,7 @@ an_attach_pci(device_t dev)
 	if (error)
 		goto fail;
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       an_intr, sc, &sc->irq_handle, 
 			       sc->arpcom.ac_if.if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/bce/if_bce.c b/sys/dev/netif/bce/if_bce.c
index 562d0e1616..b068f662fa 100644
--- a/sys/dev/netif/bce/if_bce.c
+++ b/sys/dev/netif/bce/if_bce.c
@@ -28,7 +28,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bce/if_bce.c,v 1.31 2007/05/16 23:34:11 davidch Exp $
- * $DragonFly: src/sys/dev/netif/bce/if_bce.c,v 1.16 2008/07/27 10:06:55 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/bce/if_bce.c,v 1.17 2008/08/17 04:32:32 sephe Exp $
  */
 
 /*
@@ -768,7 +768,7 @@ bce_attach(device_t dev)
 	callout_init(&sc->bce_stat_ch);
 
 	/* Hookup IRQ last. */
-	rc = bus_setup_intr(dev, sc->bce_res_irq, INTR_NETSAFE, bce_intr, sc,
+	rc = bus_setup_intr(dev, sc->bce_res_irq, INTR_MPSAFE, bce_intr, sc,
 			    &sc->bce_intrhand, ifp->if_serializer);
 	if (rc != 0) {
 		device_printf(dev, "Failed to setup IRQ!\n");
diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c
index 17fd87e842..f9bd62c6c1 100644
--- a/sys/dev/netif/bfe/if_bfe.c
+++ b/sys/dev/netif/bfe/if_bfe.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bfe/if_bfe.c 1.4.4.7 2004/03/02 08:41:33 julian Exp  v
- * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.37 2008/08/05 11:08:30 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.38 2008/08/17 04:32:32 sephe Exp $
  */
 #include "opt_ethernet.h"
 
@@ -421,7 +421,7 @@ bfe_attach(device_t dev)
 	/*
 	 * Hook interrupt last to avoid having to lock softc
 	 */
-	error = bus_setup_intr(dev, sc->bfe_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->bfe_irq, INTR_MPSAFE,
 			       bfe_intr, sc, &sc->bfe_intrhand, 
 			       sc->arpcom.ac_if.if_serializer);
 
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 292908a4cf..af68e68e3b 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.39 2005/07/03 03:41:18 silby Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.104 2008/07/27 10:06:55 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.105 2008/08/17 04:32:32 sephe Exp $
  *
  */
 
@@ -1989,7 +1989,7 @@ bge_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, ether_addr, NULL);
 
-	error = bus_setup_intr(dev, sc->bge_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->bge_irq, INTR_MPSAFE,
 			       bge_intr, sc, &sc->bge_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 47f7064779..dd6029cf2d 100644
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $
- * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.29 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.30 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -676,7 +676,7 @@ cs_attach(device_t dev)
 
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       csintr, sc, &sc->irq_handle, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index 97ec4b1f2c..ae17a17cb0 100644
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
- * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.57 2008/08/05 11:23:01 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.58 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -2174,7 +2174,7 @@ dc_attach(device_t dev)
 	 */
 	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
 
-	error = bus_setup_intr(dev, sc->dc_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->dc_irq, INTR_MPSAFE,
 			       dc_intr, sc, &sc->dc_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index aec41b39e1..3b974fb638 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.48 2008/05/14 11:59:19 sephe Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.49 2008/08/17 04:32:33 sephe Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -4189,7 +4189,7 @@ tulip_pci_attach(device_t dev)
 	    rid = 0;
 	    res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 				         RF_SHAREABLE | RF_ACTIVE);
-	    if (res == 0 || bus_setup_intr(dev, res, INTR_NETSAFE,
+	    if (res == 0 || bus_setup_intr(dev, res, INTR_MPSAFE,
 					   intr_rtn, sc, &ih,
 					   sc->tulip_if.if_serializer)) {
 		device_printf(dev, "couldn't map interrupt\n");
diff --git a/sys/dev/netif/ed/if_ed_isa.c b/sys/dev/netif/ed/if_ed_isa.c
index 3e7536e16a..34f62e5b0d 100644
--- a/sys/dev/netif/ed/if_ed_isa.c
+++ b/sys/dev/netif/ed/if_ed_isa.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.15 2003/10/31 18:31:58 brooks Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.16 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.17 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -134,7 +134,7 @@ ed_isa_attach(device_t dev)
 	if (error == 0) {
 		struct ifnet *ifp = &sc->arpcom.ac_if;
 
-		error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+		error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 				       edintr, sc, &sc->irq_handle,
 				       ifp->if_serializer);
 		if (error) {
diff --git a/sys/dev/netif/ed/if_ed_pccard.c b/sys/dev/netif/ed/if_ed_pccard.c
index cc31366b96..67df8659bd 100644
--- a/sys/dev/netif/ed/if_ed_pccard.c
+++ b/sys/dev/netif/ed/if_ed_pccard.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.55 2003/12/31 04:25:00 kato Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.21 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.22 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include "opt_ed.h"
@@ -283,7 +283,7 @@ ed_pccard_attach(device_t dev)
 	}
 #endif
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       edintr, sc, &sc->irq_handle,
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ed/if_ed_pci.c b/sys/dev/netif/ed/if_ed_pci.c
index 3bd6a867c1..1df5291cde 100644
--- a/sys/dev/netif/ed/if_ed_pci.c
+++ b/sys/dev/netif/ed/if_ed_pci.c
@@ -18,7 +18,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.34 2003/10/31 18:31:58 brooks Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.15 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.16 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -106,7 +106,7 @@ ed_pci_attach(device_t dev)
 	if (error == 0) {
 		struct ifnet *ifp = &sc->arpcom.ac_if;
 
-		error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+		error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 				       edintr, sc, &sc->irq_handle,
 				       ifp->if_serializer);
 		if (error) {
diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index b9e89dbeba..1b36f4d43c 100644
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -64,7 +64,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/dev/netif/em/if_em.c,v 1.77 2008/07/27 10:06:55 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/em/if_em.c,v 1.78 2008/08/17 04:32:33 sephe Exp $
  * $FreeBSD$
  */
 /*
@@ -679,7 +679,7 @@ em_attach(device_t dev)
 	else
 		adapter->pcix_82544 = FALSE;
 
-	error = bus_setup_intr(dev, adapter->res_interrupt, INTR_NETSAFE,
+	error = bus_setup_intr(dev, adapter->res_interrupt, INTR_MPSAFE,
 			   em_intr, adapter,
 			   &adapter->int_handler_tag, ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ep/if_ep_eisa.c b/sys/dev/netif/ep/if_ep_eisa.c
index 235b2c4432..ec1764fa3a 100644
--- a/sys/dev/netif/ep/if_ep_eisa.c
+++ b/sys/dev/netif/ep/if_ep_eisa.c
@@ -20,7 +20,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.18 2000/01/14 07:14:00 peter Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.13 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.14 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -229,7 +229,7 @@ ep_eisa_attach(device_t dev)
 		goto bad;
 	}
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE,
 			       ep_intr, sc, &sc->ep_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c
index b560573f7e..9ef6f2c1f6 100644
--- a/sys/dev/netif/ep/if_ep_isa.c
+++ b/sys/dev/netif/ep/if_ep_isa.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.8.2.1 2000/12/16 03:47:57 nyan Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.14 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.15 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -321,7 +321,7 @@ ep_isa_attach(device_t dev)
 		goto bad;
 	}
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE, ep_intr,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE, ep_intr,
 			       sc, &sc->ep_intrhand, ifp->if_serializer);
 	if (error) {
 		device_printf(dev, "bus_setup_intr() failed! (%d)\n", error);
diff --git a/sys/dev/netif/ep/if_ep_pccard.c b/sys/dev/netif/ep/if_ep_pccard.c
index e2822d0ab9..419aaf8fe1 100644
--- a/sys/dev/netif/ep/if_ep_pccard.c
+++ b/sys/dev/netif/ep/if_ep_pccard.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.12.2.2 2000/08/08 23:55:02 peter Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.12 2008/05/14 11:59:19 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.13 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -210,7 +210,7 @@ ep_pccard_attach(device_t dev)
 		goto bad;
 	}
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE, ep_intr,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE, ep_intr,
 				    sc, &sc->ep_intrhand, 
 				    sc->arpcom.ac_if.if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c
index c075403dd8..ad5e829fd6 100644
--- a/sys/dev/netif/ex/if_ex_isa.c
+++ b/sys/dev/netif/ex/if_ex_isa.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.3.2.1 2001/03/05 05:33:20 imp Exp $
- *	$DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.15 2008/05/14 11:59:19 sephe Exp $
+ *	$DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.16 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -280,7 +280,7 @@ ex_isa_attach(device_t dev)
 		goto bad;
 	}
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE,
 				ex_intr, (void *)sc, &sc->ih, 
 				ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ex/if_ex_pccard.c b/sys/dev/netif/ex/if_ex_pccard.c
index 39723ab055..8e6b402492 100644
--- a/sys/dev/netif/ex/if_ex_pccard.c
+++ b/sys/dev/netif/ex/if_ex_pccard.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.2.2.1 2001/03/05 05:33:20 imp Exp $
- *	$DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.15 2008/05/14 11:59:19 sephe Exp $
+ *	$DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.16 2008/08/17 04:32:33 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -161,7 +161,7 @@ ex_pccard_attach(device_t dev)
 		goto bad;
 	}
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE,
 				ex_intr, (void *)sc, &sc->ih, 
 				ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index 9578fc9c90..67eeb247dd 100644
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -22,7 +22,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.29 2008/05/14 11:59:20 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.30 2008/08/17 04:32:33 sephe Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
@@ -812,7 +812,7 @@ fe_attach (device_t dev)
 	ether_ifattach(&sc->sc_if, sc->sc_enaddr, NULL);
 	fe_stop(sc);
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       fe_intr, sc, &sc->irq_handle, 
 			       sc->sc_if.if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 2b62d3419a..7343367bc3 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.58 2008/08/03 11:00:32 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.59 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -678,7 +678,7 @@ fxp_attach(device_t dev)
 	ifq_set_maxlen(&ifp->if_snd, FXP_USABLE_TXCB);
 	ifq_set_ready(&ifp->if_snd);
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE,
 			       fxp_intr, sc, &sc->ih, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index adc32680c1..c75c39fccc 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.41 2008/05/14 11:59:20 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.42 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -549,7 +549,7 @@ lge_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->lge_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->lge_irq, INTR_MPSAFE,
 			       lge_intr, sc, &sc->lge_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/lnc/if_lnc_isa.c b/sys/dev/netif/lnc/if_lnc_isa.c
index 8ec9a6d49d..76a53c3aa9 100644
--- a/sys/dev/netif/lnc/if_lnc_isa.c
+++ b/sys/dev/netif/lnc/if_lnc_isa.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_le_isa.c,v 1.41 2005/12/24 20:27:41 perry Exp $	*/
 /*	$FreeBSD: src/sys/dev/le/if_le_isa.c,v 1.1 2006/05/17 21:25:22 marius Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/lnc/if_lnc_isa.c,v 1.11 2008/05/14 11:59:20 sephe Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/lnc/if_lnc_isa.c,v 1.12 2008/08/17 04:32:33 sephe Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -424,7 +424,7 @@ le_isa_attach(device_t dev)
 		goto fail_dmap;
 	}
 
-	error = bus_setup_intr(dev, lesc->sc_ires, INTR_NETSAFE | INTR_MPSAFE,
+	error = bus_setup_intr(dev, lesc->sc_ires, INTR_MPSAFE,
 	    am7990_intr, sc, &lesc->sc_ih, sc->ifp->if_serializer);
 	if (error != 0) {
 		device_printf(dev, "cannot set up interrupt\n");
diff --git a/sys/dev/netif/lnc/if_lnc_pci.c b/sys/dev/netif/lnc/if_lnc_pci.c
index a7f1990129..b5a769f6ab 100644
--- a/sys/dev/netif/lnc/if_lnc_pci.c
+++ b/sys/dev/netif/lnc/if_lnc_pci.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/le/if_le_pci.c,v 1.4 2006/06/05 15:14:14 marius Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/lnc/if_lnc_pci.c,v 1.12 2008/05/14 11:59:20 sephe Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/lnc/if_lnc_pci.c,v 1.13 2008/08/17 04:32:33 sephe Exp $	*/
 
 
 /*-
@@ -437,7 +437,7 @@ le_pci_attach(device_t dev)
 		goto fail_dmap;
 	}
 
-	error = bus_setup_intr(dev, lesc->sc_ires, INTR_NETSAFE | INTR_MPSAFE,
+	error = bus_setup_intr(dev, lesc->sc_ires, INTR_MPSAFE,
 	    am79900_intr, sc, &lesc->sc_ih, sc->ifp->if_serializer);
 	if (error != 0) {
 		device_printf(dev, "cannot set up interrupt\n");
diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c
index c2d541e6b3..f7be0f33cc 100644
--- a/sys/dev/netif/mn/if_mn.c
+++ b/sys/dev/netif/mn/if_mn.c
@@ -22,7 +22,7 @@
  * this gadget.
  *
  * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $
- * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.17 2007/06/03 20:51:08 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.18 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -1345,7 +1345,7 @@ mn_attach (device_t self)
 		return(ENXIO);
 	}
 
-	error = bus_setup_intr(self, sc->irq, INTR_NETSAFE, mn_intr, sc, 
+	error = bus_setup_intr(self, sc->irq, INTR_MPSAFE, mn_intr, sc, 
 			       &sc->intrhand, NULL);
 
 	if (error) {
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index cacd25cdaa..cdd1a3fe09 100644
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -26,7 +26,7 @@
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
  * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $
- * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.30 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.31 2008/08/17 04:32:34 sephe Exp $
  *
  * Myson fast ethernet PCI NIC driver
  *
@@ -952,7 +952,7 @@ my_attach(device_t dev)
 
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->my_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->my_irq, INTR_MPSAFE,
 			       my_intr, sc, &sc->my_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ndis/if_ndis.c b/sys/dev/netif/ndis/if_ndis.c
index b3bb39b640..fd4d04a9e0 100644
--- a/sys/dev/netif/ndis/if_ndis.c
+++ b/sys/dev/netif/ndis/if_ndis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.65 2004/07/07 17:46:30 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/ndis/if_ndis.c,v 1.22 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ndis/if_ndis.c,v 1.23 2008/08/17 04:32:34 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -649,7 +649,7 @@ nonettypes:
 	}
 
 	if (error == 0) {
-		error = bus_setup_intr(dev, sc->ndis_irq, INTR_NETSAFE,
+		error = bus_setup_intr(dev, sc->ndis_irq, INTR_MPSAFE,
 				       ndis_intr, sc,
 				       &sc->ndis_intrhand, 
 				       ifp->if_serializer);
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index 4ba86bc238..e677e35246 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.48 2008/05/16 13:19:12 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.49 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -899,7 +899,7 @@ nge_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->nge_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->nge_irq, INTR_MPSAFE,
 			       nge_intr, sc, &sc->nge_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index 2d1f82f742..17d9ab08eb 100644
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.33 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.34 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -615,7 +615,7 @@ pcn_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->pcn_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->pcn_irq, INTR_MPSAFE,
 			       pcn_intr, sc, &sc->pcn_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c
index 23c1086aa3..b35d273555 100644
--- a/sys/dev/netif/re/if_re.c
+++ b/sys/dev/netif/re/if_re.c
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $
- * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.47 2008/08/10 17:19:38 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.48 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -1277,7 +1277,7 @@ re_attach(device_t dev)
 #endif	/* RE_DIAG */
 
 	/* Hook interrupt last to avoid having to lock softc */
-	error = bus_setup_intr(dev, sc->re_irq, INTR_NETSAFE, re_intr, sc,
+	error = bus_setup_intr(dev, sc->re_irq, INTR_MPSAFE, re_intr, sc,
 			       &sc->re_intrhand, ifp->if_serializer);
 
 	if (error) {
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index c17afa8401..a657f4e722 100644
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.37 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.38 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -929,7 +929,7 @@ rl_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->rl_irq, INTR_NETSAFE, rl_intr,
+	error = bus_setup_intr(dev, sc->rl_irq, INTR_MPSAFE, rl_intr,
 			       sc, &sc->rl_intrhand, ifp->if_serializer);
 
 	if (error) {
diff --git a/sys/dev/netif/sbni/if_sbni_pci.c b/sys/dev/netif/sbni/if_sbni_pci.c
index 7c869c5fd9..07d60f2fbb 100644
--- a/sys/dev/netif/sbni/if_sbni_pci.c
+++ b/sys/dev/netif/sbni/if_sbni_pci.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.6 2002/09/28 20:59:59 phk Exp $
- * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.15 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.16 2008/08/17 04:32:34 sephe Exp $
  */
 
  
@@ -142,7 +142,7 @@ sbni_pci_attach(device_t dev)
 	if (sc->irq_res) {
 		struct ifnet *ifp = &sc->arpcom.ac_if;
 
-		error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+		error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 				       sbni_intr, sc, &sc->irq_handle,
 				       ifp->if_serializer);
 		if (error) {
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index e7ee68b77c..e26549a536 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.27 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.28 2008/08/17 04:32:34 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -266,7 +266,7 @@ sbsh_attach(device_t dev)
 
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 				sbsh_intr, sc, &sc->intr_hand, 
 				ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index 2007f2274c..14c417fbc9 100644
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
- * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.32 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.33 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -777,7 +777,7 @@ sf_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->sf_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->sf_irq, INTR_MPSAFE,
 			       sf_intr, sc, &sc->sf_intrhand, 
 			       ifp->if_serializer);
 
diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index 21ce1b43fb..4ef023e6ef 100644
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.37 2008/05/14 11:59:21 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.38 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -1300,7 +1300,7 @@ sis_attach(device_t dev)
 	 */
 	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
 
-	error = bus_setup_intr(dev, sc->sis_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->sis_irq, INTR_MPSAFE,
 			       sis_intr, sc, 
 			       &sc->sis_intrhand, 
 			       ifp->if_serializer);
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index f092091146..91691bf9f6 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -31,7 +31,7 @@
  *
  * $OpenBSD: if_sk.c,v 1.129 2006/10/16 12:30:08 tom Exp $
  * $FreeBSD: /c/ncvs/src/sys/pci/if_sk.c,v 1.20 2000/04/22 02:16:37 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.56 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.57 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -1508,7 +1508,7 @@ skc_attach(device_t dev)
 
 	bus_generic_attach(dev);
 
-	error = bus_setup_intr(dev, sc->sk_irq, INTR_NETSAFE, sk_intr, sc,
+	error = bus_setup_intr(dev, sc->sk_irq, INTR_MPSAFE, sk_intr, sc,
 			       &sc->sk_intrhand, &sc->sk_serializer);
 	if (error) {
 		device_printf(dev, "couldn't set up irq\n");
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 6b57803d6d..928a432d76 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *   $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $
- *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.28 2008/05/14 11:59:22 sephe Exp $
+ *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.29 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -227,7 +227,7 @@ sn_attach(device_t dev)
 
 	ether_ifattach(ifp, sc->arpcom.ac_enaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->irq_res, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE,
 			       sn_intr, sc, &sc->intrhand,
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 078fb5e2fe..cf199692c0 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.37 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.38 2008/08/17 04:32:34 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -968,7 +968,7 @@ ste_attach(device_t dev)
          */
         ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
  
-	error = bus_setup_intr(dev, sc->ste_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->ste_irq, INTR_MPSAFE,
 			       ste_intr, sc, &sc->ste_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 35a3b8b172..610d939a70 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.52 2008/05/16 13:19:12 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.53 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -1564,7 +1564,7 @@ ti_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->ti_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->ti_irq, INTR_MPSAFE,
 			       ti_intr, sc, &sc->ti_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index afe4cb1827..e587a41efa 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.39 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.40 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -1238,7 +1238,7 @@ tl_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->tl_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->tl_irq, INTR_MPSAFE,
 			       tl_intr, sc, &sc->tl_intrhand, 
 			       ifp->if_serializer);
 
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 8b05daf4bf..6dee9fb2c4 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.42 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.43 2008/08/17 04:32:35 sephe Exp $
  */
 
 /*
@@ -271,7 +271,7 @@ epic_attach(device_t dev)
 	ether_ifattach(ifp, sc->sc_macaddr, NULL);
 	ifp->if_hdrlen = sizeof(struct ether_vlan_header);
 
-	error = bus_setup_intr(dev, sc->irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->irq, INTR_MPSAFE,
 			       epic_intr, sc, &sc->sc_ih, 
 			       ifp->if_serializer);
 
diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index 262931758d..9c36f899de 100644
--- a/sys/dev/netif/txp/if_txp.c
+++ b/sys/dev/netif/txp/if_txp.c
@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $	*/
 /*	$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */
-/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.49 2008/05/16 13:19:12 sephe Exp $ */
+/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.50 2008/08/17 04:32:35 sephe Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -312,7 +312,7 @@ txp_attach(device_t dev)
 
 	ether_ifattach(ifp, enaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->sc_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->sc_irq, INTR_MPSAFE,
 			       txp_intr, sc, &sc->sc_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index 625f1be31d..da6fe7f1f6 100644
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.47 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.48 2008/08/17 04:32:35 sephe Exp $
  */
 
 /*
@@ -789,7 +789,7 @@ vr_attach(device_t dev)
 	/* Call MI attach routine. */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->vr_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->vr_irq, INTR_MPSAFE,
 			       vr_intr, sc, &sc->vr_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/dev/netif/vx/if_vx_eisa.c b/sys/dev/netif/vx/if_vx_eisa.c
index 92ee0adec7..248753a2e3 100644
--- a/sys/dev/netif/vx/if_vx_eisa.c
+++ b/sys/dev/netif/vx/if_vx_eisa.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.14 2000/01/29 14:50:31 peter Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.16 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.17 2008/08/17 04:32:35 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -142,7 +142,7 @@ vx_eisa_attach(device_t dev)
 
     vxattach(dev);
 
-    if (bus_setup_intr(dev, sc->vx_irq, INTR_NETSAFE, 
+    if (bus_setup_intr(dev, sc->vx_irq, INTR_MPSAFE, 
 		       vxintr, sc, &sc->vx_intrhand,
 		       ifp->if_serializer)
     ) {
diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c
index df5d572321..1fd98f009f 100644
--- a/sys/dev/netif/vx/if_vx_pci.c
+++ b/sys/dev/netif/vx/if_vx_pci.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.21 2000/05/28 15:59:52 peter Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.16 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.17 2008/08/17 04:32:35 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -172,7 +172,7 @@ vx_pci_attach(device_t dev)
 	}
     }
 
-    if (bus_setup_intr(dev, sc->vx_irq, INTR_NETSAFE,
+    if (bus_setup_intr(dev, sc->vx_irq, INTR_MPSAFE,
 		       vxintr, sc, &sc->vx_intrhand, 
 		       ifp->if_serializer)
     ) {
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index 3a35f2e2d5..e76f41afc7 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.41 2008/05/14 11:59:22 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.42 2008/08/17 04:32:35 sephe Exp $
  */
 
 /*
@@ -810,7 +810,7 @@ wb_attach(device_t dev)
 	 */
 	ether_ifattach(ifp, eaddr, NULL);
 
-	error = bus_setup_intr(dev, sc->wb_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->wb_irq, INTR_MPSAFE,
 			       wb_intr, sc, &sc->wb_intrhand, 
 			       ifp->if_serializer);
 
diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c
index 783c308381..07bdbb47c4 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.33 2008/08/11 18:01:17 swildner Exp $ */
+/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.34 2008/08/17 04:32:35 sephe Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -551,7 +551,7 @@ wlattach(device_t dev)
 	kprintf(", Freq %d MHz",sc->freq24); 		/* 2.4 Gz       */
     kprintf("\n");                                       /* 2.4 Gz       */
 
-    error = bus_setup_intr(dev, sc->res_irq, INTR_NETSAFE,
+    error = bus_setup_intr(dev, sc->res_irq, INTR_MPSAFE,
 			   wlintr, sc, &sc->intr_handle, 
 			   ifp->if_serializer);
     if (error) {
diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index ac35d64d17..ce6b5de230 100644
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -25,7 +25,7 @@
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
  * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.39 2003/10/14 22:51:35 rsm Exp $
- * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.35 2008/05/14 11:59:23 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.36 2008/08/17 04:32:35 sephe Exp $
  */
 
 /*
@@ -329,7 +329,7 @@ xe_attach (device_t dev)
   /* Attach the interface */
   ether_ifattach(scp->ifp, scp->arpcom.ac_enaddr, NULL);
 
-  err = bus_setup_intr(dev, scp->irq_res, INTR_NETSAFE,
+  err = bus_setup_intr(dev, scp->irq_res, INTR_MPSAFE,
 		       xe_intr, scp, &scp->intrhand,
 		       scp->ifp->if_serializer);
   if (err) {
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index 35767d5f26..2369cb8ba8 100644
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.28 2003/10/08 06:01:57 murray Exp $
- * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.53 2008/07/27 11:26:59 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.54 2008/08/17 04:32:35 sephe Exp $
  */
 
 /*
@@ -1598,7 +1598,7 @@ done:
         ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
 
 	/* Hook interrupt last to avoid having to lock softc */
-	error = bus_setup_intr(dev, sc->xl_irq, INTR_NETSAFE,
+	error = bus_setup_intr(dev, sc->xl_irq, INTR_MPSAFE,
 			       xl_intr, sc, &sc->xl_intrhand, 
 			       ifp->if_serializer);
 	if (error) {
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index c984b2e8fc..79b4b1df5e 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/bus.h,v 1.30.2.5 2004/03/17 17:54:25 njl Exp $
- * $DragonFly: src/sys/sys/bus.h,v 1.26 2007/09/12 07:59:31 hasso Exp $
+ * $DragonFly: src/sys/sys/bus.h,v 1.27 2008/08/17 04:32:32 sephe Exp $
  */
 
 #ifndef _SYS_BUS_H_
@@ -71,8 +71,6 @@ typedef void driver_intr_t(void*);
 #define	INTR_NOENTROPY	0x0400
 #define INTR_NOPOLL	0x0800	/* interrupt cannot be polled (e.g. ata) */
 
-#define INTR_NETSAFE	INTR_MPSAFE
-
 enum intr_trigger {
     INTR_TRIGGER_CONFORM = 0,
     INTR_TRIGGER_EDGE = 1,