From owner-p4-projects@FreeBSD.ORG  Wed Nov 30 04:02:48 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 7F2C116A422; Wed, 30 Nov 2005 04:02:48 +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 52B1416A41F
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 04:02:48 +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 AEB4543D68
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 04:02:39 +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 jAU42dd3083664
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 04:02:39 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU42dx2083661
	for perforce@freebsd.org; Wed, 30 Nov 2005 04:02:39 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 30 Nov 2005 04:02:39 GMT
Message-Id: <200511300402.jAU42dx2083661@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 87497 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 04:02:49 -0000

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

Change 87497 by sam@sam_ebb on 2005/11/30 04:02:14

	use new slottime setting, not old one when updating based
	on a rcvd beacon

Affected files ...

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

Differences ...

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

@@ -2126,7 +2126,7 @@
 				 */
 				ieee80211_set_shortslottime(ic,
 					IEEE80211_IS_CHAN_A(ic->ic_bsschan) ||
-					(ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
+					(scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
 				ni->ni_capinfo = scan.capinfo;
 				/* XXX statistic */
 			}