From owner-p4-projects@FreeBSD.ORG  Sat Mar 10 02:26:09 2007
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 56CC416A407; Sat, 10 Mar 2007 02:26:09 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2B9D316A401
	for <perforce@FreeBSD.org>; Sat, 10 Mar 2007 02:26:09 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CD1813C46B
	for <perforce@FreeBSD.org>; Sat, 10 Mar 2007 02:26:09 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l2A2Q8Lu012513
	for <perforce@FreeBSD.org>; Sat, 10 Mar 2007 02:26:08 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l2A2Q8wc012510
	for perforce@freebsd.org; Sat, 10 Mar 2007 02:26:08 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Sat, 10 Mar 2007 02:26:08 GMT
Message-Id: <200703100226.l2A2Q8wc012510@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 115647 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: Sat, 10 Mar 2007 02:26:09 -0000

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

Change 115647 by sephe@sephe_zealot:sam_wifi on 2007/03/10 02:25:26

	Correct unit of assoc/reassoc request listen interval field,
	which should be number of beacons instead of TUs.
	
	Reviewed by:	sam@

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#20 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#67 edit

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#20 (text+ko) ====

@@ -814,7 +814,8 @@
 .Fl powersave
 to disable powersave operation.
 .It Cm powersavesleep Ar sleep
-Set the desired max powersave sleep time in milliseconds.
+Set the desired max powersave sleep time in TU's (1024 usecs).
+By default the max powersave sleep time is 100 TU's.
 .It Cm protmode Ar technique
 For interfaces operating in 802.11g, use the specified
 .Ar technique

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#67 (text+ko) ====

@@ -1771,7 +1771,10 @@
 		*(u_int16_t *)frm = htole16(capinfo);
 		frm += 2;
 
-		*(u_int16_t *)frm = htole16(ic->ic_lintval);
+		KASSERT(ic->ic_bss->ni_intval != 0,
+			("beacon interval is zero!"));
+		*(u_int16_t *)frm = htole16(howmany(ic->ic_lintval,
+						    ic->ic_bss->ni_intval));
 		frm += 2;
 
 		if (type == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) {