From owner-p4-projects@FreeBSD.ORG  Tue Feb  3 19:40:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BBA21065673; Tue,  3 Feb 2009 19:40:03 +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 1DB10106566B
	for <perforce@FreeBSD.org>; Tue,  3 Feb 2009 19:40:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BA9D8FC17
	for <perforce@FreeBSD.org>; Tue,  3 Feb 2009 19:40:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n13Je2Lg067655
	for <perforce@FreeBSD.org>; Tue, 3 Feb 2009 19:40:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n13Je2Cn067653
	for perforce@freebsd.org; Tue, 3 Feb 2009 19:40:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 3 Feb 2009 19:40:02 GMT
Message-Id: <200902031940.n13Je2Cn067653@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 157103 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: Tue, 03 Feb 2009 19:40:04 -0000

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

Change 157103 by hselasky@hselasky_laptop001 on 2009/02/03 19:39:10

	
	Fix a compilation issue when INVARIANTS is enabled.
	
	Move some code around so that the softc pointer
	is always used and we don't get a variable
	not used compilation warning.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#18 (text+ko) ====

@@ -419,7 +419,6 @@
 	 */
 	usb2_transfer_start(sc->sc_xfer[CDCE_BULK_B]);
 	usb2_transfer_start(sc->sc_xfer[CDCE_BULK_A]);
-	usb2_transfer_start(sc->sc_xfer[CDCE_INTR]);
 }
 
 static void
@@ -551,12 +550,18 @@
 static void
 cdce_init(struct usb2_ether *ue)
 {
+	struct cdce_softc *sc = usb2_ether_getsc(ue);
 	struct ifnet *ifp = usb2_ether_getifp(ue);
 
 	CDCE_LOCK_ASSERT(sc, MA_OWNED);
 
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+
+	/*
+	 * start all the transfers
+	 */
 	cdce_start(ue);
+	usb2_transfer_start(sc->sc_xfer[CDCE_INTR]);
 }
 
 static void