From owner-svn-src-all@FreeBSD.ORG Fri Mar 25 00:40:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B3331065673; Fri, 25 Mar 2011 00:40:09 +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 DE7168FC18; Fri, 25 Mar 2011 00:40:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2P0e8Z3062327; Fri, 25 Mar 2011 00:40:08 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2P0e86u062324; Fri, 25 Mar 2011 00:40:08 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201103250040.p2P0e86u062324@svn.freebsd.org> From: Adrian Chadd Date: Fri, 25 Mar 2011 00:40:08 +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: r219979 - in head/sys/dev/ath/ath_hal: ar5416 ar9001 ar9002 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2011 00:40:09 -0000 Author: adrian Date: Fri Mar 25 00:40:08 2011 New Revision: 219979 URL: http://svn.freebsd.org/changeset/base/219979 Log: Flip ANI on for the AR5416 and later chips. I haven't verified it on the AR9285 so I'll leave it off for that. Ath9k sources indiciate that one of the ANI modes interferes with RIFS detection, so match ath9k and disable that. Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Fri Mar 25 00:06:58 2011 (r219978) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Fri Mar 25 00:40:08 2011 (r219979) @@ -57,8 +57,9 @@ ar5416AniSetup(struct ath_hal *ah) .rssiThrLow = 7, .period = 100, }; - /* NB: ANI is not enabled yet */ - ar5416AniAttach(ah, &aniparams, &aniparams, AH_FALSE); + /* NB: disable ANI noise immmunity for reliable RIFS rx */ + AH5416(ah)->ah_ani_function &= ~ HAL_ANI_NOISE_IMMUNITY_LEVEL; + ar5416AniAttach(ah, &aniparams, &aniparams, AH_TRUE); } /* Modified: head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c Fri Mar 25 00:06:58 2011 (r219978) +++ head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c Fri Mar 25 00:40:08 2011 (r219979) @@ -80,8 +80,10 @@ ar9160AniSetup(struct ath_hal *ah) .rssiThrLow = 7, .period = 100, }; - /* NB: ANI is not enabled yet */ - ar5416AniAttach(ah, &aniparams, &aniparams, AH_FALSE); + + /* NB: disable ANI noise immmunity for reliable RIFS rx */ + AH5416(ah)->ah_ani_function &= ~ HAL_ANI_NOISE_IMMUNITY_LEVEL; + ar5416AniAttach(ah, &aniparams, &aniparams, AH_TRUE); } /* Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Fri Mar 25 00:06:58 2011 (r219978) +++ head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Fri Mar 25 00:40:08 2011 (r219979) @@ -96,7 +96,7 @@ ar9280AniSetup(struct ath_hal *ah) AH5416(ah)->ah_ani_function &= ~ HAL_ANI_NOISE_IMMUNITY_LEVEL; /* NB: ANI is not enabled yet */ - ar5416AniAttach(ah, &aniparams, &aniparams, AH_FALSE); + ar5416AniAttach(ah, &aniparams, &aniparams, AH_TRUE); } /*