From owner-svn-src-all@FreeBSD.ORG  Mon Apr  4 14:53:37 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 23B7E1065676;
	Mon,  4 Apr 2011 14:53:37 +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 EE55F8FC1C;
	Mon,  4 Apr 2011 14:53:36 +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 p34EraBL086599;
	Mon, 4 Apr 2011 14:53:36 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p34Era4q086595;
	Mon, 4 Apr 2011 14:53:36 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201104041453.p34Era4q086595@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 4 Apr 2011 14:53:36 +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: r220325 - in head/sys/dev/ath/ath_hal: . ar9002
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: Mon, 04 Apr 2011 14:53:37 -0000

Author: adrian
Date: Mon Apr  4 14:53:36 2011
New Revision: 220325
URL: http://svn.freebsd.org/changeset/base/220325

Log:
  Commit missing bits from the last commit:
  
  * add the hal capability flag
  * make sure its disabled for the ar9280/ar9285.

Modified:
  head/sys/dev/ath/ath_hal/ah_internal.h
  head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
  head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c

Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h	Mon Apr  4 14:52:31 2011	(r220324)
+++ head/sys/dev/ath/ath_hal/ah_internal.h	Mon Apr  4 14:53:36 2011	(r220325)
@@ -197,7 +197,8 @@ typedef struct {
 			halMbssidAggrSupport		: 1,
 			halBssidMatchSupport		: 1,
 			hal4kbSplitTransSupport		: 1,
-			halHasPsPollSupport		: 1;
+			halHasPsPollSupport		: 1,
+			halHasRxSelfLinkedTail		: 1;
 	uint32_t	halWirelessModes;
 	uint16_t	halTotalQueues;
 	uint16_t	halKeyCacheSize;

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Mon Apr  4 14:52:31 2011	(r220324)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Mon Apr  4 14:53:36 2011	(r220325)
@@ -780,6 +780,8 @@ ar9280FillCapabilityInfo(struct ath_hal 
 #endif
 	pCap->halAutoSleepSupport = AH_FALSE;	/* XXX? */
 	pCap->hal4kbSplitTransSupport = AH_FALSE;
+	/* Disable this so Block-ACK works correctly */
+	pCap->halHasRxSelfLinkedTail = AH_FALSE;
 	if (AR_SREV_MERLIN_20_OR_LATER(ah))
 		pCap->halHasPsPollSupport = AH_TRUE;
 	pCap->halRxStbcSupport = 1;

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Mon Apr  4 14:52:31 2011	(r220324)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Mon Apr  4 14:53:36 2011	(r220325)
@@ -380,6 +380,8 @@ ar9285FillCapabilityInfo(struct ath_hal 
 #endif
 	pCap->halAutoSleepSupport = AH_FALSE;	/* XXX? */
 	pCap->hal4kbSplitTransSupport = AH_FALSE;
+	/* Disable this so Block-ACK works correctly */
+	pCap->halHasRxSelfLinkedTail = AH_FALSE;
 	if (AR_SREV_KITE_12_OR_LATER(ah))
 		pCap->halHasPsPollSupport = AH_TRUE;