PERFORCE change 139281 for review

[Sam Leffler]

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

Change 139281 by sam at 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;
 }