From owner-svn-src-all@FreeBSD.ORG  Tue Mar 22 13:39:00 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6D73A1065677;
	Tue, 22 Mar 2011 13:39:00 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C2E78FC08;
	Tue, 22 Mar 2011 13:39:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2MDd08V061170;
	Tue, 22 Mar 2011 13:39:00 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2MDd0PH061168;
	Tue, 22 Mar 2011 13:39:00 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103221339.p2MDd0PH061168@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 22 Mar 2011 13:39:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219870 - head/sys/dev/ath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Mar 2011 13:39:00 -0000

Author: adrian
Date: Tue Mar 22 13:39:00 2011
New Revision: 219870
URL: http://svn.freebsd.org/changeset/base/219870

Log:
  Clean up setting the short preamble bit in the rate - this way it
  is very obvious (and cleanly so) that it occurs for non-11n rates.

Modified:
  head/sys/dev/ath/if_ath_tx_ht.c

Modified: head/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx_ht.c	Tue Mar 22 13:35:56 2011	(r219869)
+++ head/sys/dev/ath/if_ath_tx_ht.c	Tue Mar 22 13:39:00 2011	(r219870)
@@ -143,9 +143,6 @@ ath_rateseries_setup(struct ath_softc *s
 #endif
 
 		series[i].Rate = rt->info[rix[i]].rateCode;
-		/* the short preamble field is only applicable for non-MCS rates */
-		if (shortPreamble && ! (series[i].Rate & IEEE80211_RATE_MCS))
-			series[i].Rate |= rt->info[rix[i]].shortPreamble;
 
 		/* PktDuration doesn't include slot, ACK, RTS, etc timing - it's just the packet duration */
 		if (series[i].Rate & IEEE80211_RATE_MCS) {
@@ -156,6 +153,8 @@ ath_rateseries_setup(struct ath_softc *s
 				, series[i].RateFlags & HAL_RATESERIES_2040
 				, series[i].RateFlags & HAL_RATESERIES_HALFGI);
 		} else {
+			if (shortPreamble)
+				series[i].Rate |= rt->info[rix[i]].shortPreamble;
 			series[i].PktDuration = ath_hal_computetxtime(ah,
 			    rt, pktlen, rix[i], shortPreamble);
 		}