From owner-p4-projects@FreeBSD.ORG  Thu Apr  3 18:01:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 829E31065675; Thu,  3 Apr 2008 18:01:13 +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 445E81065671
	for <perforce@freebsd.org>; Thu,  3 Apr 2008 18:01:13 +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 2F6F18FC1E
	for <perforce@freebsd.org>; Thu,  3 Apr 2008 18:01:13 +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 m33I1DqR098468
	for <perforce@freebsd.org>; Thu, 3 Apr 2008 18:01:13 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33I1DEp098466
	for perforce@freebsd.org; Thu, 3 Apr 2008 18:01:13 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 3 Apr 2008 18:01:13 GMT
Message-Id: <200804031801.m33I1DEp098466@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 139281 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, 03 Apr 2008 18:01:13 -0000

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

Change 139281 by sam@sam_ebb on 2008/04/03 18:00:25

	move ENETRESET handling from ieee80211_ioctl to ieee80211_set80211
	where it's used; it's no longer necessary to handle issues like
	media change as we're managing state change push to the driver
	through iv_reset (otherwise falling back to the state machine)

Affected files ...

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

Differences ...

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

@@ -3067,8 +3067,12 @@
 	if (error == ERESTART)
 		error = IFNET_IS_UP_RUNNING(vap->iv_ifp) ?
 		    vap->iv_reset(vap, ireq->i_type) : 0;
-	if (error == ENETRESET && !IS_UP_AUTO(vap))
+	if (error == ENETRESET) {
+		/* XXX need to re-think AUTO handling */
+		if (IS_UP_AUTO(vap))
+			ieee80211_init(vap);
 		error = 0;
+	}
 	return error;
 }
 
@@ -3232,15 +3236,5 @@
 		error = ether_ioctl(ifp, cmd, data);
 		break;
 	}
-	/*
-	 * The convention is to return ENETRESET when an operation
-	 * requires a complete re-initialization of the device (e.g.
-	 * changing something that affects the association state).
-	 */
-	if (error == ENETRESET) {
-		if (IFNET_IS_UP_RUNNING(ifp))
-			ieee80211_init(vap);
-		error = 0;
-	}
 	return error;
 }