From owner-p4-projects@FreeBSD.ORG  Mon Mar 19 10:56:53 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 8CEAA16A401; Mon, 19 Mar 2007 10:56:53 +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 5D91016A40B
	for <perforce@FreeBSD.org>; Mon, 19 Mar 2007 10:56:53 +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 4B8C513C465
	for <perforce@FreeBSD.org>; Mon, 19 Mar 2007 10:56:53 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2JAuraF077845
	for <perforce@FreeBSD.org>; Mon, 19 Mar 2007 10:56:53 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2JAurjS077842
	for perforce@freebsd.org; Mon, 19 Mar 2007 10:56:53 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Mon, 19 Mar 2007 10:56:53 GMT
Message-Id: <200703191056.l2JAurjS077842@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 116130 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: Mon, 19 Mar 2007 10:56:53 -0000

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

Change 116130 by sephe@sephe_zealot:sam_wifi on 2007/03/19 10:56:26

	Correct the condition of setting short slot time subfield in
	assoc/reassoc req, so shslot-capable NIC will not be counted
	as shslot-encapable NIC.
	
	Reviewed-by: sam@

Affected files ...

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

Differences ...

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

@@ -1765,7 +1765,7 @@
 		if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) &&
 		    IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan))
 			capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE;
-		if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) &&
+		if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
 		    (ic->ic_caps & IEEE80211_C_SHSLOT))
 			capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME;
 		*(u_int16_t *)frm = htole16(capinfo);