From owner-svn-src-head@FreeBSD.ORG  Tue Jan 25 05:47:50 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C5E0D106566B;
	Tue, 25 Jan 2011 05:47:50 +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 B53688FC0A;
	Tue, 25 Jan 2011 05:47:50 +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 p0P5lo5K019015;
	Tue, 25 Jan 2011 05:47:50 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0P5loAC019013;
	Tue, 25 Jan 2011 05:47:50 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201101250547.p0P5loAC019013@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 25 Jan 2011 05:47:50 +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: r217813 - head/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 25 Jan 2011 05:47:50 -0000

Author: adrian
Date: Tue Jan 25 05:47:50 2011
New Revision: 217813
URL: http://svn.freebsd.org/changeset/base/217813

Log:
  Bring over a fix from ath9k - zero some of the TX descriptors for Kite/AR9285.
  
  Kite doesn't have per-chain control (it has one chain) or antenna control; so
  don't try to set those descriptor entries.

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c	Tue Jan 25 05:41:36 2011	(r217812)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c	Tue Jan 25 05:47:50 2011	(r217813)
@@ -230,6 +230,13 @@ ar5416SetupTxDesc(struct ath_hal *ah, st
 		ads->ds_ctl2 |= SM(rtsctsDuration, AR_BurstDur);
 		ads->ds_ctl7 |= (rtsctsRate << AR_RTSCTSRate_S);
 	}
+
+	if (AR_SREV_KITE(ah)) {
+		ads->ds_ctl8 = 0;
+		ads->ds_ctl9 = 0;
+		ads->ds_ctl10 = 0;
+		ads->ds_ctl11 = 0;
+	}
 	return AH_TRUE;
 #undef RTSCTS
 }
@@ -417,6 +424,13 @@ ar5416SetupFirstTxDesc(struct ath_hal *a
 			| (flags & HAL_TXDESC_RTSENA ? AR_RTSEnable : 0);
 		ads->ds_ctl2 |= SM(rtsctsDuration, AR_BurstDur);
 	}
+
+	if (AR_SREV_KITE(ah)) {
+		ads->ds_ctl8 = 0;
+		ads->ds_ctl9 = 0;
+		ads->ds_ctl10 = 0;
+		ads->ds_ctl11 = 0;
+	}
 	
 	return AH_TRUE;
 #undef RTSCTS