From owner-svn-src-all@FreeBSD.ORG  Fri Feb 11 13:05:16 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 19B5C106564A;
	Fri, 11 Feb 2011 13:05:16 +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 08FD48FC1B;
	Fri, 11 Feb 2011 13:05:16 +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 p1BD5FNL060649;
	Fri, 11 Feb 2011 13:05:15 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1BD5FII060647;
	Fri, 11 Feb 2011 13:05:15 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201102111305.p1BD5FII060647@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 11 Feb 2011 13:05:15 +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: r218556 - 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: Fri, 11 Feb 2011 13:05:16 -0000

Author: adrian
Date: Fri Feb 11 13:05:15 2011
New Revision: 218556
URL: http://svn.freebsd.org/changeset/base/218556

Log:
  The last parameter to ath_computedur_ht() is short-GI, not short-preamble.

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	Fri Feb 11 12:56:05 2011	(r218555)
+++ head/sys/dev/ath/if_ath_tx_ht.c	Fri Feb 11 13:05:15 2011	(r218556)
@@ -133,7 +133,7 @@ ath_rateseries_setup(struct ath_softc *s
 				, txrate
 				, ic->ic_rxstream
 				, (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40)
-				, shortPreamble);
+				, series[i].rateFlags & HAL_RATESERIES_HALFGI);
 		} else {
 			series[i].PktDuration = ath_hal_computetxtime(ah,
 			    rt, pktlen, rix[i], shortPreamble);