From owner-p4-projects@FreeBSD.ORG  Wed Nov 30 05:18:29 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 1B99D16A425; Wed, 30 Nov 2005 05:18:29 +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 E706816A420
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 05:18:28 +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 E20DC43D8A
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 05:18:13 +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 jAU5ID7n094069
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 05:18:13 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU5IDH2094066
	for perforce@freebsd.org; Wed, 30 Nov 2005 05:18:13 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 30 Nov 2005 05:18:13 GMT
Message-Id: <200511300518.jAU5IDH2094066@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 87503 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: Wed, 30 Nov 2005 05:18:30 -0000

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

Change 87503 by sam@sam_ebb on 2005/11/30 05:17:59

	save power save fixes

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#71 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#71 (text+ko) ====

@@ -2147,8 +2147,14 @@
 				int max = tim->tim_len + min - 4;
 				if ((tim->tim_bitctl&1) ||
 				    (min <= ix && ix <= max &&
-				     isset(tim->tim_bitmap - min, aid)))
+				     isset(tim->tim_bitmap - min, aid))) {
+					/* 
+					 * XXX Do not let bg scan kick off
+					 * we are expecting data.
+					 */
+					ic->ic_lastdata = ticks;
 					ieee80211_sta_pwrsave(ic, 0);
+				}
 #endif
 				ni->ni_dtim_count = tim->tim_count;
 				ni->ni_dtim_period = tim->tim_period;
@@ -2167,11 +2173,18 @@
 			 * return on-channel to receive a beacon from
 			 * our ap.
 			 */
-			if (ic->ic_flags & IEEE80211_F_SCAN)
+			if (ic->ic_flags & IEEE80211_F_SCAN) {
 				ieee80211_add_scan(ic, &scan, wh,
 					subtype, rssi, noise, rstamp);
-			else if (contbgscan(ic) || startbgscan(ic))
+			} else if (contbgscan(ic)) {
+				ieee80211_bg_scan(ic);
+			} else if (startbgscan(ic)) {
+#if 0
+				/* wakeup if we are sleeing */
+				ieee80211_set_pwrsave(ic, 0);
+#endif
 				ieee80211_bg_scan(ic);
+			}
 			return;
 		}
 		/*