From owner-p4-projects@FreeBSD.ORG  Fri Sep 16 20:43:59 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A3CD616A447; Fri, 16 Sep 2005 20:43:58 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 66D5316A42C
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:43:58 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3644243D45
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:43:58 +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 j8GKhw4J020943
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:43:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8GKhvno020940
	for perforce@freebsd.org; Fri, 16 Sep 2005 20:43:57 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Sep 2005 20:43:57 GMT
Message-Id: <200509162043.j8GKhvno020940@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>
Cc: 
Subject: PERFORCE change 83756 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 16 Sep 2005 20:43:59 -0000

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

Change 83756 by sam@sam_ebb on 2005/09/16 20:43:25

	cancel any bg scan when we get a frame to send

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#103 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#103 (text+ko) ====

@@ -1508,6 +1508,15 @@
 				 * the frame back when the time is right.
 				 */
 				ieee80211_pwrsave(ni, m);
+				/*
+				 * If we're in power save mode 'cuz of a bg
+				 * scan cancel it so the traffic can flow.
+				 * The packet we just queued will automatically
+				 * get sent when we drop out of power save.
+				 * XXX locking
+				 */
+				if (ic->ic_flags & IEEE80211_F_SCAN)
+					ieee80211_cancel_scan(ic);
 				goto reclaim;
 			}
 			/* calculate priority so we can find the tx queue */