svn commit: r191768 - head/sys/net80211

[Andrew Thompson]

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;