From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 20:26:34 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BC661065672; Fri, 28 Nov 2008 20:26:34 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 374F48FC19; Fri, 28 Nov 2008 20:26:34 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mASKQYrI029156; Fri, 28 Nov 2008 20:26:34 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mASKQXSD029152; Fri, 28 Nov 2008 20:26:33 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200811282026.mASKQXSD029152@svn.freebsd.org> From: Sam Leffler Date: Fri, 28 Nov 2008 20:26:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185412 - in projects/ath_hal: . ar5211 ar5212 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2008 20:26:34 -0000 Author: sam Date: Fri Nov 28 20:26:33 2008 New Revision: 185412 URL: http://svn.freebsd.org/changeset/base/185412 Log: kill AH_DISABLE_WME stuff; it's been posible to do this from the driver for a while Modified: projects/ath_hal/ah.c projects/ath_hal/ar5211/ar5211_xmit.c projects/ath_hal/ar5212/ar5212_xmit.c projects/ath_hal/version.h Modified: projects/ath_hal/ah.c ============================================================================== --- projects/ath_hal/ah.c Fri Nov 28 20:14:41 2008 (r185411) +++ projects/ath_hal/ah.c Fri Nov 28 20:26:33 2008 (r185412) @@ -108,9 +108,6 @@ const char* ath_hal_buildopts[] = { #ifdef AH_USE_INIPDGAIN "INIPDGAIN", #endif -#ifdef AH_DISABLE_WME - "DISABLE_WME", -#endif #ifdef AH_SUPPORT_11D "11D", #endif Modified: projects/ath_hal/ar5211/ar5211_xmit.c ============================================================================== --- projects/ath_hal/ar5211/ar5211_xmit.c Fri Nov 28 20:14:41 2008 (r185411) +++ projects/ath_hal/ar5211/ar5211_xmit.c Fri Nov 28 20:26:33 2008 (r185412) @@ -360,23 +360,6 @@ ar5211ResetTxQueue(struct ath_hal *ah, u break; } -#ifndef AH_DISABLE_WME - /* - * Yes, this is a hack and not the right way to do it, but - * it does get the lockout bits and backoff set for the - * high-pri WME queues for testing. We need to either extend - * the meaning of queueInfo->mode, or create something like - * queueInfo->dcumode. - */ - if (qi->tqi_intFlags & HAL_TXQ_USE_LOCKOUT_BKOFF_DIS) { - OS_REG_WRITE(ah, AR_DMISC(q), - OS_REG_READ(ah, AR_DMISC(q)) | - SM(AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL, - AR_D_MISC_ARB_LOCKOUT_CNTRL)| - AR_D_MISC_POST_FR_BKOFF_DIS); - } -#endif - /* * Always update the secondary interrupt mask registers - this * could be a new queue getting enabled in a running system or Modified: projects/ath_hal/ar5212/ar5212_xmit.c ============================================================================== --- projects/ath_hal/ar5212/ar5212_xmit.c Fri Nov 28 20:14:41 2008 (r185411) +++ projects/ath_hal/ar5212/ar5212_xmit.c Fri Nov 28 20:26:33 2008 (r185412) @@ -423,20 +423,6 @@ ar5212ResetTxQueue(struct ath_hal *ah, u break; } -#ifndef AH_DISABLE_WME - /* - * Yes, this is a hack and not the right way to do it, but - * it does get the lockout bits and backoff set for the - * high-pri WME queues for testing. We need to either extend - * the meaning of queueInfo->mode, or create something like - * queueInfo->dcumode. - */ - if (qi->tqi_intFlags & HAL_TXQ_USE_LOCKOUT_BKOFF_DIS) { - dmisc |= SM(AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL, - AR_D_MISC_ARB_LOCKOUT_CNTRL) - | AR_D_MISC_POST_FR_BKOFF_DIS; - } -#endif OS_REG_WRITE(ah, AR_QMISC(q), qmisc); OS_REG_WRITE(ah, AR_DMISC(q), dmisc); Modified: projects/ath_hal/version.h ============================================================================== --- projects/ath_hal/version.h Fri Nov 28 20:14:41 2008 (r185411) +++ projects/ath_hal/version.h Fri Nov 28 20:26:33 2008 (r185412) @@ -16,4 +16,4 @@ * * $Id: version.h,v 1.64 2008/11/27 22:29:27 sam Exp $ */ -#define ATH_HAL_VERSION "0.11.3.8" +#define ATH_HAL_VERSION "0.11.3.9"