From owner-p4-projects@FreeBSD.ORG  Wed Jul 20 01:02:05 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 0999016A421; Wed, 20 Jul 2005 01:02:05 +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 D90D116A41F
	for <perforce@freebsd.org>; Wed, 20 Jul 2005 01:02:04 +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 AAEDF43D49
	for <perforce@freebsd.org>; Wed, 20 Jul 2005 01:02:04 +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 j6K124ek008936
	for <perforce@freebsd.org>; Wed, 20 Jul 2005 01:02:04 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6K124Jw008933
	for perforce@freebsd.org; Wed, 20 Jul 2005 01:02:04 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Jul 2005 01:02:04 GMT
Message-Id: <200507200102.j6K124Jw008933@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 80570 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, 20 Jul 2005 01:02:05 -0000

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

Change 80570 by sam@sam_ebb on 2005/07/20 01:01:06

	fix short preamble handling for mcast frames

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#90 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#90 (text+ko) ====

@@ -3860,7 +3860,7 @@
 		 */
 		if (ismcast) {
 			/*
-			 * Check mcast rate setting in case it changed.
+			 * Check mcast rate setting in case it's changed.
 			 * XXX move out of fastpath
 			 */
 			if (ic->ic_mcast_rate != sc->sc_mcastrate) {
@@ -3870,6 +3870,8 @@
 			}
 			rix = sc->sc_mcastrix;
 			txrate = rt->info[rix].rateCode;
+			if (shortPreamble)
+				txrate |= rt->info[rix].shortPreamble;
 			try0 = ATH_TXMAXTRY;
 		} else {
 			ath_rate_findrate(sc, an, shortPreamble, pktlen,