From owner-p4-projects@FreeBSD.ORG  Mon Jan 15 22:50:13 2007
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 9A0EF16A416; Mon, 15 Jan 2007 22:50:13 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5B58916A40F
	for <perforce@freebsd.org>; Mon, 15 Jan 2007 22:50:13 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CE2113C441
	for <perforce@freebsd.org>; Mon, 15 Jan 2007 22:50:13 +0000 (UTC)
	(envelope-from kmacy@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 l0FMoDip031898
	for <perforce@freebsd.org>; Mon, 15 Jan 2007 22:50:13 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0FMoD5h031895
	for perforce@freebsd.org; Mon, 15 Jan 2007 22:50:13 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 15 Jan 2007 22:50:13 GMT
Message-Id: <200701152250.l0FMoD5h031895@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112954 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: Mon, 15 Jan 2007 22:50:13 -0000

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

Change 112954 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/15 22:49:30

	fix panic in iwi_node_free caused by ic_ifp not being set when
	media_init is indirectly called from attach, by moving initialization
	of ic_ifp earlier

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#20 edit

Differences ...

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#20 (text+ko) ====

@@ -378,6 +378,7 @@
 		device_printf(dev, "can not if_alloc()\n");
 		goto fail;
 	}
+	ic->ic_ifp = ifp;
 	ifp->if_softc = sc;
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
@@ -389,7 +390,6 @@
 	ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
 	IFQ_SET_READY(&ifp->if_snd);
 
-	ic->ic_ifp = ifp;
 	ic->ic_wme.wme_update = iwi_wme_update;
 	ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */
 	ic->ic_opmode = IEEE80211_M_STA; /* default to BSS mode */