From owner-p4-projects@FreeBSD.ORG  Wed Nov 30 04:03:42 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 E9B9316A422; Wed, 30 Nov 2005 04:03:41 +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 C548616A41F
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 04:03:41 +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 71B1443D58
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 04:03:41 +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 jAU43fQ8083689
	for <perforce@freebsd.org>; Wed, 30 Nov 2005 04:03:41 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAU43fHH083686
	for perforce@freebsd.org; Wed, 30 Nov 2005 04:03:41 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 30 Nov 2005 04:03:41 GMT
Message-Id: <200511300403.jAU43fHH083686@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 87498 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:03:42 -0000

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

Change 87498 by sam@sam_ebb on 2005/11/30 04:03:07

	update only the slot time capability based on rcvd beacons;
	was copying all of capinfo

Affected files ...

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

Differences ...

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

@@ -2127,7 +2127,8 @@
 				ieee80211_set_shortslottime(ic,
 					IEEE80211_IS_CHAN_A(ic->ic_bsschan) ||
 					(scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
-				ni->ni_capinfo = scan.capinfo;
+				ni->ni_capinfo = (ni->ni_capinfo &~ IEEE80211_CAPINFO_SHORT_SLOTTIME)
+					       | (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME);
 				/* XXX statistic */
 			}
 			if (scan.wme != NULL &&