From owner-svn-src-head@FreeBSD.ORG  Mon Apr 29 23:57:41 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C856A99C;
 Mon, 29 Apr 2013 23:57:41 +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 B9D561F1F;
 Mon, 29 Apr 2013 23:57:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TNvf0m051145;
 Mon, 29 Apr 2013 23:57:41 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TNvfQi051144;
 Mon, 29 Apr 2013 23:57:41 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304292357.r3TNvfQi051144@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 29 Apr 2013 23:57:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250082 - head/sys/contrib/dev/ath/ath_hal/ar9300
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: Mon, 29 Apr 2013 23:57:41 -0000

Author: adrian
Date: Mon Apr 29 23:57:41 2013
New Revision: 250082
URL: http://svnweb.freebsd.org/changeset/base/250082

Log:
  Sync from git - ah_config is in 'ath_hal', not 'ath_hal_private' on
  FreeBSD.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c	Mon Apr 29 23:08:13 2013	(r250081)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c	Mon Apr 29 23:57:41 2013	(r250082)
@@ -704,7 +704,7 @@ ar9300_ani_control(struct ath_hal *ah, H
                 return AH_TRUE;
             }
             /* if we're turning off ANI, reset regs back to INI settings */
-            if (AH_PRIVATE(ah)->ah_config.ath_hal_enable_ani) {
+            if (ah->ah_config.ath_hal_enable_ani) {
                 HAL_ANI_CMD savefunc = ahp->ah_ani_function;
                 /* temporarly allow all functions so we can reset */
                 ahp->ah_ani_function = HAL_ANI_ALL;