svn commit: r222021 - head/sys/dev/ath/ath_hal/ar5212

[Adrian Chadd]

Author: adrian
Date: Tue May 17 11:56:50 2011
New Revision: 222021
URL: http://svn.freebsd.org/changeset/base/222021

Log:
  Use the halMcastKeySrchSupport capability bit to selectively enable/disable
  the multicast key search support for AR5212, AR5416 and later.
  
  The general HAL routine ath_hal_getcapability() implement checking this
  but it's overridden by a check in ar5212_misc:ar5212GetCapability().
  This restores the later functionality in case it's found to be broken
  in any of the 11n chipsets.

Modified:
  head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Tue May 17 11:52:53 2011	(r222020)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Tue May 17 11:56:50 2011	(r222021)
@@ -857,7 +857,7 @@ ar5212GetCapability(struct ath_hal *ah, 
 	case HAL_CAP_MCAST_KEYSRCH:	/* multicast frame keycache search */
 		switch (capability) {
 		case 0:			/* hardware capability */
-			return HAL_OK;
+			return pcap->halMcastKeySrchSupport ? HAL_OK : HAL_ENXIO;
 		case 1:
 			return (ahp->ah_staId1Defaults &
 			    AR_STA_ID1_MCAST_KSRCH) ? HAL_OK : HAL_ENXIO;