From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 19 05:52:23 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E06653E; Mon, 19 Nov 2012 05:52:23 +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 62C1A8FC08; Mon, 19 Nov 2012 05:52:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJ5qNSW094183; Mon, 19 Nov 2012 05:52:23 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJ5qNr7094182; Mon, 19 Nov 2012 05:52:23 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201211190552.qAJ5qNr7094182@svn.freebsd.org> From: Adrian Chadd Date: Mon, 19 Nov 2012 05:52:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r243261 - stable/9/sys/dev/ath/ath_hal/ar5416 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 05:52:23 -0000 Author: adrian Date: Mon Nov 19 05:52:23 2012 New Revision: 243261 URL: http://svnweb.freebsd.org/changeset/base/243261 Log: Merge r227468: Don't fondle this particular CCA register from extension channel. Modified: stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Modified: stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c ============================================================================== --- stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Mon Nov 19 05:24:33 2012 (r243260) +++ stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Mon Nov 19 05:52:23 2012 (r243261) @@ -342,11 +342,6 @@ ar5416AniControl(struct ath_hal *ah, HAL OS_REG_RMW_FIELD(ah, AR_PHY_TIMING5, AR_PHY_TIMING5_CYCPWR_THR1, params->cycPwrThr1[level]); - /* Only set the ext channel cycpwr_thr1 field for ht/40 */ - if (IEEE80211_IS_CHAN_HT40(AH_PRIVATE(ah)->ah_curchan)) - OS_REG_RMW_FIELD(ah, AR_PHY_EXT_CCA, - AR_PHY_EXT_TIMING5_CYCPWR_THR1, params->cycPwrThr1[level]); - if (level > aniState->spurImmunityLevel) ahp->ah_stats.ast_ani_spurup++; else if (level < aniState->spurImmunityLevel)