From owner-svn-src-all@FreeBSD.ORG  Sun May  3 18:29:04 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C43A01065670;
	Sun,  3 May 2009 18:29:04 +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 B1A008FC16;
	Sun,  3 May 2009 18:29:04 +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 n43IT4Sq020978;
	Sun, 3 May 2009 18:29:04 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n43IT4t9020977;
	Sun, 3 May 2009 18:29:04 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200905031829.n43IT4t9020977@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sun, 3 May 2009 18:29:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191768 - head/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 May 2009 18:29:05 -0000

Author: thompsa
Date: Sun May  3 18:29:04 2009
New Revision: 191768
URL: http://svn.freebsd.org/changeset/base/191768

Log:
  Relax the condition for printing the lost state transition message. The new
  state will be set before the EXT_STATEWAIT flag is cleared and its ok to
  transition again at that point.

Modified:
  head/sys/net80211/ieee80211_proto.c

Modified: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c	Sun May  3 17:51:38 2009	(r191767)
+++ head/sys/net80211/ieee80211_proto.c	Sun May  3 18:29:04 2009	(r191768)
@@ -1722,19 +1722,21 @@ ieee80211_new_state_locked(struct ieee80
 			 * state changes until this is completed.
 			 */
 			return -1;
-		}
+		} else if (vap->iv_state != vap->iv_nstate) {
 #if 0
-		/* 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]);
+			/* 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]);
 #else
-		/* XXX temporarily enable to identify issues */
-		if_printf(vap->iv_ifp, "%s: pending %s -> %s transition lost\n",
-		    __func__, ieee80211_state_name[vap->iv_state],
-		    ieee80211_state_name[vap->iv_nstate]);
+			/* XXX temporarily enable to identify issues */
+			if_printf(vap->iv_ifp,
+			    "%s: pending %s -> %s transition lost\n",
+			    __func__, ieee80211_state_name[vap->iv_state],
+			    ieee80211_state_name[vap->iv_nstate]);
 #endif
+		}
 	}
 
 	nrunning = nscanning = 0;