From 2a567ae5ec2f43e3527d4de50a7a0ba00b81b2be Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 28 Aug 2004 15:10:35 +0000
Subject: [PATCH] Tag a last set of PCI network interfaces as IFF_NEEDSGIANT
 until they are either locked down or demonstrated MPSAFE.

---
 sys/dev/sf/if_sf.c | 3 ++-
 sys/dev/ti/if_ti.c | 3 ++-
 sys/pci/if_pcn.c   | 3 ++-
 sys/pci/if_sf.c    | 3 ++-
 sys/pci/if_ste.c   | 3 ++-
 sys/pci/if_ti.c    | 3 ++-
 sys/pci/if_tl.c    | 3 ++-
 sys/pci/if_wb.c    | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 67089afa2df..91a9441f986 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -706,7 +706,8 @@ sf_attach(dev)
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	ifp->if_ioctl = sf_ioctl;
 	ifp->if_start = sf_start;
 	ifp->if_watchdog = sf_watchdog;
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 62fcf991135..f9ee1e4e542 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -2157,7 +2157,8 @@ ti_attach(dev)
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	tis[unit] = sc;
 	ifp->if_ioctl = ti_ioctl;
 	ifp->if_start = ti_start;
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 976b330d43b..ddfa67f1a15 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -552,7 +552,8 @@ pcn_attach(dev)
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	ifp->if_ioctl = pcn_ioctl;
 	ifp->if_start = pcn_start;
 	ifp->if_watchdog = pcn_watchdog;
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 67089afa2df..91a9441f986 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -706,7 +706,8 @@ sf_attach(dev)
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	ifp->if_ioctl = sf_ioctl;
 	ifp->if_start = sf_start;
 	ifp->if_watchdog = sf_watchdog;
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index e1f65315399..2284d667de5 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -1074,7 +1074,8 @@ ste_attach(dev)
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	ifp->if_ioctl = ste_ioctl;
 	ifp->if_start = ste_start;
 	ifp->if_watchdog = ste_watchdog;
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 62fcf991135..f9ee1e4e542 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -2157,7 +2157,8 @@ ti_attach(dev)
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	tis[unit] = sc;
 	ifp->if_ioctl = ti_ioctl;
 	ifp->if_start = ti_start;
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index deb80057152..e453b929425 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1262,7 +1262,8 @@ tl_attach(dev)
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	ifp->if_ioctl = tl_ioctl;
 	ifp->if_start = tl_start;
 	ifp->if_watchdog = tl_watchdog;
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index d089339f564..ef38978052e 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -855,7 +855,8 @@ wb_attach(dev)
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_mtu = ETHERMTU;
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
+	    IFF_NEEDSGIANT;
 	ifp->if_ioctl = wb_ioctl;
 	ifp->if_start = wb_start;
 	ifp->if_watchdog = wb_watchdog;