From owner-svn-src-head@FreeBSD.ORG  Sat Nov 17 02:39:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4DF7529D;
 Sat, 17 Nov 2012 02:39:38 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 33A0D8FC0C;
 Sat, 17 Nov 2012 02:39:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAH2dcLQ007561;
 Sat, 17 Nov 2012 02:39:38 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAH2dc42007560;
 Sat, 17 Nov 2012 02:39:38 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201211170239.qAH2dc42007560@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 17 Nov 2012 02:39:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243174 - head/sys/dev/ath/ath_hal/ar5210
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Nov 2012 02:39:38 -0000

Author: adrian
Date: Sat Nov 17 02:39:37 2012
New Revision: 243174
URL: http://svnweb.freebsd.org/changeset/base/243174

Log:
  Correctly populate the RTS field.
  
  Tested:
  	* AR5210, STA mode, RTS enabled

Modified:
  head/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c

Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c	Sat Nov 17 02:39:09 2012	(r243173)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c	Sat Nov 17 02:39:37 2012	(r243174)
@@ -518,7 +518,8 @@ ar5210SetupTxDesc(struct ath_hal *ah, st
 		ads->ds_ctl1 = 0;
 	if (flags & HAL_TXDESC_RTSENA) {
 		ads->ds_ctl0 |= AR_RTSCTSEnable;
-		ads->ds_ctl1 |= rtsctsDuration & AR_RTSDuration;
+		ads->ds_ctl1 |= (rtsctsDuration << AR_RTSDuration_S)
+		    & AR_RTSDuration;
 	}
 	return AH_TRUE;
 }