From owner-p4-projects@FreeBSD.ORG  Tue May 17 23:31:36 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7729516A4D1; Tue, 17 May 2005 23:31:36 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 39C6316A4CE
	for <perforce@freebsd.org>; Tue, 17 May 2005 23:31:36 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F3B3A43D8F
	for <perforce@freebsd.org>; Tue, 17 May 2005 23:31:35 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4HNVZdF060698
	for <perforce@freebsd.org>; Tue, 17 May 2005 23:31:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4HNVZQG060695
	for perforce@freebsd.org; Tue, 17 May 2005 23:31:35 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 17 May 2005 23:31:35 GMT
Message-Id: <200505172331.j4HNVZQG060695@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>
Subject: PERFORCE change 77112 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 17 May 2005 23:31:37 -0000

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

Change 77112 by sam@sam_ebb on 2005/05/17 23:31:08

	Fixup tx timeout of mgmt frames in sta mode: don't assert fail
	if this happens while scanning; it shouldn't happen but it's
	ok in that case to just ignore the timeout.  While here add a
	debug msg in case it continues to happen.

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#12 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#12 (text+ko) ====

@@ -1563,9 +1563,13 @@
 {
 	struct ieee80211vap *vap = arg;
 
-	KASSERT((vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0,
-		("mgt frame timeout while scanning?"));
-	if (vap->iv_state != IEEE80211_S_INIT)
+	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
+	    "%s: state %s%s\n", __func__,
+	    ieee80211_state_name[vap->iv_state],
+	    vap->iv_ic->ic_flags & IEEE80211_F_SCAN ? ", scan active" : "");
+
+	if (vap->iv_state != IEEE80211_S_INIT &&
+	    (vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0)
 		ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
 }