svn commit: r220325 - in head/sys/dev/ath/ath_hal: . ar9002

[Adrian Chadd]

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;