From owner-freebsd-wireless@FreeBSD.ORG Fri Aug 24 17:40:19 2012 Return-Path: Delivered-To: freebsd-wireless@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76249106576E for ; Fri, 24 Aug 2012 17:40:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 523858FC22 for ; Fri, 24 Aug 2012 17:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7OHe6gx048475 for ; Fri, 24 Aug 2012 17:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7OHe6Ai048474; Fri, 24 Aug 2012 17:40:06 GMT (envelope-from gnats) Date: Fri, 24 Aug 2012 17:40:06 GMT Message-Id: <201208241740.q7OHe6Ai048474@freefall.freebsd.org> To: freebsd-wireless@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: kern/170904: commit references a PR X-BeenThere: freebsd-wireless@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: "Discussions of 802.11 stack, tools device driver development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2012 17:40:19 -0000 The following reply was made to PR kern/170904; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: kern/170904: commit references a PR Date: Fri, 24 Aug 2012 17:38:05 +0000 (UTC) Author: adrian Date: Fri Aug 24 17:37:51 2012 New Revision: 239657 URL: http://svn.freebsd.org/changeset/base/239657 Log: Correctly handle the "pe_enabled" flag - both when configuring DFS and fetching the current DFS configuration. PR: kern/170904 Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Fri Aug 24 17:37:12 2012 (r239656) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Fri Aug 24 17:37:51 2012 (r239657) @@ -1160,7 +1160,12 @@ ar5212EnableDfs(struct ath_hal *ah, HAL_ val &= ~AR_PHY_RADAR_0_INBAND; val |= SM(pe->pe_inband, AR_PHY_RADAR_0_INBAND); } - OS_REG_WRITE(ah, AR_PHY_RADAR_0, val | AR_PHY_RADAR_0_ENA); + if (pe->pe_enabled) + val |= AR_PHY_RADAR_0_ENA; + else + val &= ~ AR_PHY_RADAR_0_ENA; + + OS_REG_WRITE(ah, AR_PHY_RADAR_0, val); } /* @@ -1206,6 +1211,7 @@ ar5212GetDfsThresh(struct ath_hal *ah, H pe->pe_height = MS(val, AR_PHY_RADAR_0_HEIGHT); pe->pe_prssi = MS(val, AR_PHY_RADAR_0_PRSSI); pe->pe_inband = MS(val, AR_PHY_RADAR_0_INBAND); + pe->pe_enabled = !! (val & AR_PHY_RADAR_0_ENA); pe->pe_relpwr = 0; pe->pe_relstep = 0; _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"