From owner-svn-src-head@FreeBSD.ORG  Tue May 21 05:51:49 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9F27083F;
 Tue, 21 May 2013 05:51:49 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 91555176;
 Tue, 21 May 2013 05:51:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4L5pnr8035935;
 Tue, 21 May 2013 05:51:49 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4L5pn3h035934;
 Tue, 21 May 2013 05:51:49 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201305210551.r4L5pn3h035934@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 21 May 2013 05:51:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250841 - head/sys/dev/ath/ath_hal/ar5416
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 21 May 2013 05:51:49 -0000

Author: adrian
Date: Tue May 21 05:51:49 2013
New Revision: 250841
URL: http://svnweb.freebsd.org/changeset/base/250841

Log:
  Extend the TXOP enforce capability to support checking whether it's
  supported.

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

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Tue May 21 03:05:49 2013	(r250840)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Tue May 21 05:51:49 2013	(r250841)
@@ -466,6 +466,10 @@ ar5416GetCapability(struct ath_hal *ah, 
 	case HAL_CAP_DIVERSITY:		/* disable classic fast diversity */
 		return HAL_ENXIO;
 	case HAL_CAP_ENFORCE_TXOP:
+		if (capability == 0)
+			return (HAL_OK);
+		if (capability != 1)
+			return (HAL_ENOTSUPP);
 		(*result) =
 		    !! (AH5212(ah)->ah_miscMode & AR_PCU_TXOP_TBTT_LIMIT_ENA);
 		return (HAL_OK);
@@ -499,6 +503,8 @@ ar5416SetCapability(struct ath_hal *ah, 
 			pCap->halTxStreams = 1;
 		return AH_TRUE;
 	case HAL_CAP_ENFORCE_TXOP:
+		if (capability != 1)
+			return (HAL_ENOTSUPP);
 		if (setting) {
 			AH5212(ah)->ah_miscMode
 			    |= AR_PCU_TXOP_TBTT_LIMIT_ENA;