From owner-p4-projects@FreeBSD.ORG  Tue Jan 15 23:40:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EA2E16A41A; Tue, 15 Jan 2008 23:40:40 +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 D7BFA16A420
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:40:39 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C151C13C468
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:40:39 +0000 (UTC)
	(envelope-from sam@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 m0FNedYr002566
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:40:39 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNedIB002563
	for perforce@freebsd.org; Tue, 15 Jan 2008 23:40:39 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 15 Jan 2008 23:40:39 GMT
Message-Id: <200801152340.m0FNedIB002563@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 133371 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, 15 Jan 2008 23:40:40 -0000

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

Change 133371 by sam@sam_ebb on 2008/01/15 23:39:42

	if_init takes the softc, not the ifp

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#21 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#21 (text+ko) ====

@@ -3048,7 +3048,7 @@
 			 * side-effect of bringing ourself up.
 			 */
 			if (vap->iv_state < IEEE80211_S_RUN)
-				ieee80211_init(ifp);
+				ieee80211_init(vap);
 		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 			/*
 			 * Stop ourself.  If we are the last vap to be
@@ -3153,7 +3153,7 @@
 	 */
 	if (error == ENETRESET) {
 		if (IFNET_IS_UP_RUNNING(ifp))
-			ieee80211_init(ifp);
+			ieee80211_init(vap);
 		error = 0;
 	} else if (error == ERESTART) {
 		error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap) : 0;