From owner-p4-projects@FreeBSD.ORG  Sun Nov  5 21:55:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8D95C16A417; Sun,  5 Nov 2006 21:55:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6278416A403
	for <perforce@freebsd.org>; Sun,  5 Nov 2006 21:55:01 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1188A43D79
	for <perforce@freebsd.org>; Sun,  5 Nov 2006 21:54:54 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA5Lsrx8091701
	for <perforce@freebsd.org>; Sun, 5 Nov 2006 21:54:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA5LsrT3091698
	for perforce@freebsd.org; Sun, 5 Nov 2006 21:54:53 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 5 Nov 2006 21:54:53 GMT
Message-Id: <200611052154.kA5LsrT3091698@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109303 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: Sun, 05 Nov 2006 21:55:01 -0000

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

Change 109303 by sam@sam_ebb on 2006/11/05 21:54:11

	Fix crash after ifconfig npe1; mii requires that a pointer
	to the ifnet be the FIRST element in the softc.  This is
	truly gross and horrible; never knew mii required this.

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#3 (text+ko) ====

@@ -82,13 +82,14 @@
 };
 
 struct npe_softc {
+	/* XXX mii requires this be first; do not move! */
+	struct ifnet	*sc_ifp;	/* ifnet pointer */
 	struct mtx	sc_mtx;		/* basically a perimeter lock */
 	device_t	sc_dev;
 	bus_space_tag_t	sc_iot;		
 	bus_space_handle_t sc_ioh;	/* MAC register window */
 	device_t	sc_mii;		/* child miibus */
 	bus_space_handle_t sc_miih;	/* MII register window */
-	struct ifnet	*sc_ifp;	/* ifnet pointer */
 	struct ixpnpe_softc *sc_npe;	/* NPE support */
 	int		sc_portid;
 	struct callout	tick_ch;	/* Tick callout */
@@ -243,6 +244,7 @@
 
 	npe_getmac(sc, eaddr);
 
+	/* NB: must be setup prior to invoking mii code */
 	sc->sc_ifp = ifp = if_alloc(IFT_ETHER);
 	if (mii_phy_probe(dev, &sc->sc_mii, npe_ifmedia_update, npe_ifmedia_status)) {
 		device_printf(dev, "Cannot find my PHY.\n");