From owner-p4-projects@FreeBSD.ORG  Thu Jan 10 16:48:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A01C216A469; Thu, 10 Jan 2008 16:48:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6609016A420
	for <perforce@freebsd.org>; Thu, 10 Jan 2008 16:48:28 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6313413C44B
	for <perforce@freebsd.org>; Thu, 10 Jan 2008 16:48:28 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0AGmSKF042064
	for <perforce@freebsd.org>; Thu, 10 Jan 2008 16:48:28 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0AGmSV5042061
	for perforce@freebsd.org; Thu, 10 Jan 2008 16:48:28 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 10 Jan 2008 16:48:28 GMT
Message-Id: <200801101648.m0AGmSV5042061@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132973 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jan 2008 16:48:28 -0000

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

Change 132973 by jhb@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