PERFORCE change 132973 for review

[John Baldwin]

http://perforce.freebsd.org/chv.cgi?CH=132973

Change 132973 by jhb at jhb_zion on 2008/01/10 16:47:48

	Drop some local diffs.

Affected files ...

.. //depot/projects/power/sys/dev/fxp/if_fxp.c#10 edit
.. //depot/projects/power/sys/dev/fxp/if_fxpvar.h#5 edit
.. //depot/projects/power/sys/pci/if_ste.c#13 edit

Differences ...

==== //depot/projects/power/sys/dev/fxp/if_fxp.c#10 (text+ko) ====

@@ -1496,9 +1496,6 @@
 	struct ifnet *ifp = sc->ifp;
 	uint8_t statack;
 
-	if (sc->gone)
-		return;
-
 	FXP_LOCK(sc);
 	if (sc->suspended) {
 		FXP_UNLOCK(sc);

==== //depot/projects/power/sys/dev/fxp/if_fxpvar.h#5 (text+ko) ====

@@ -179,7 +179,6 @@
 	int flags;
 	uint8_t rfa_size;
 	uint32_t tx_cmd;
-	int gone;
 };
 
 #define FXP_FLAG_MWI_ENABLE	0x0001	/* MWI enable */

==== //depot/projects/power/sys/pci/if_ste.c#13 (text+ko) ====

@@ -1001,9 +1001,6 @@
 	sc = device_get_softc(dev);
 	sc->ste_dev = dev;
 
-	mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
-	    MTX_DEF | MTX_RECURSE);
-
 	/*
 	 * Only use one PHY since this chip reports multiple
 	 * Note on the DFE-550 the PHY is at 1 on the DFE-580