From owner-svn-src-head@FreeBSD.ORG  Tue May 17 11:56: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 CEF16106566B;
	Tue, 17 May 2011 11:56: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 BEE1A8FC13;
	Tue, 17 May 2011 11:56:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4HBuoYu030072;
	Tue, 17 May 2011 11:56:50 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4HBuoNb030070;
	Tue, 17 May 2011 11:56:50 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105171156.p4HBuoNb030070@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 17 May 2011 11:56: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: r222021 - head/sys/dev/ath/ath_hal/ar5212
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, 17 May 2011 11:56:50 -0000

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;