Date: Fri, 28 Nov 2008 20:26:33 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r185412 - in projects/ath_hal: . ar5211 ar5212 Message-ID: <200811282026.mASKQXSD029152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811282026.mASKQXSD029152>