From owner-svn-src-head@FreeBSD.ORG Thu Apr 24 23:11:37 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09D985E2; Thu, 24 Apr 2014 23:11:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB1281C1E; Thu, 24 Apr 2014 23:11:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ONBaj3090913; Thu, 24 Apr 2014 23:11:36 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ONBaDk090912; Thu, 24 Apr 2014 23:11:36 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201404242311.s3ONBaDk090912@svn.freebsd.org> From: Adrian Chadd Date: Thu, 24 Apr 2014 23:11:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264900 - head/sys/dev/ath/ath_hal/ar5211 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.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Apr 2014 23:11:37 -0000 Author: adrian Date: Thu Apr 24 23:11:36 2014 New Revision: 264900 URL: http://svnweb.freebsd.org/changeset/base/264900 Log: Fix the AR5211 power mode tracking stuff. Tested: * AR5211, STA mode Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_power.c Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_power.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_power.c Thu Apr 24 23:11:18 2014 (r264899) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_power.c Thu Apr 24 23:11:36 2014 (r264900) @@ -110,21 +110,23 @@ ar5211SetPowerMode(struct ath_hal *ah, H setChip ? "set chip " : ""); switch (mode) { case HAL_PM_AWAKE: + ah->ah_powerMode = mode; status = ar5211SetPowerModeAwake(ah, setChip); break; case HAL_PM_FULL_SLEEP: ar5211SetPowerModeSleep(ah, setChip); + ah->ah_powerMode = mode; break; case HAL_PM_NETWORK_SLEEP: ar5211SetPowerModeNetworkSleep(ah, setChip); + ah->ah_powerMode = mode; break; default: HALDEBUG(ah, HAL_DEBUG_ANY, "%s: unknown power mode %u\n", __func__, mode); return AH_FALSE; } - ah->ah_powerMode = mode; - return status; + return status; } HAL_POWER_MODE