From owner-svn-src-user@FreeBSD.ORG  Sat Apr 25 05:45:08 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 670D9106564A;
	Sat, 25 Apr 2009 05:45:08 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 55FC88FC16;
	Sat, 25 Apr 2009 05:45:08 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3P5j8Zt043550;
	Sat, 25 Apr 2009 05:45:08 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3P5j82A043549;
	Sat, 25 Apr 2009 05:45:08 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200904250545.n3P5j82A043549@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sat, 25 Apr 2009 05:45:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191480 - user/thompsa/vaptq/sys/net80211
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Apr 2009 05:45:08 -0000

Author: thompsa
Date: Sat Apr 25 05:45:08 2009
New Revision: 191480
URL: http://svn.freebsd.org/changeset/base/191480

Log:
  Add a bandaid for external events trashing the pending state change to INIT.

Modified:
  user/thompsa/vaptq/sys/net80211/ieee80211_proto.c

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_proto.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_proto.c	Sat Apr 25 05:14:56 2009	(r191479)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_proto.c	Sat Apr 25 05:45:08 2009	(r191480)
@@ -1684,12 +1684,20 @@ ieee80211_new_state_locked(struct ieee80
 
 	IEEE80211_LOCK_ASSERT(ic);
 
-	/* Warn if the previous state hasn't completed. XXX Queue? */
-	if (vap->iv_state != vap->iv_nstate)
+	if (vap->iv_state != vap->iv_nstate) {
+		if (vap->iv_nstate == IEEE80211_S_INIT) {
+			/*
+			 * XXX The vap is being stopped, do no allow any other
+			 * state changes until this is completed.
+			 */
+			return (-1);
+		}
+		/* Warn if the previous state hasn't completed. */
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
 			     "%s: pending %s -> %s transition lost\n", __func__,
 			     ieee80211_state_name[vap->iv_state],
 			     ieee80211_state_name[vap->iv_nstate]);
+	}
 
 	nrunning = nscanning = 0;
 	/* XXX can track this state instead of calculating */