From owner-svn-src-head@FreeBSD.ORG  Wed Jan  2 03:56:20 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
 by hub.freebsd.org (Postfix) with ESMTP id D9E409DB;
 Wed,  2 Jan 2013 03:56:20 +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 BD7828FC14;
 Wed,  2 Jan 2013 03:56:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r023uKAn006545;
 Wed, 2 Jan 2013 03:56:20 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r023uKxV006543;
 Wed, 2 Jan 2013 03:56:20 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201301020356.r023uKxV006543@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 2 Jan 2013 03:56:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244950 - head/sys/dev/ath/ath_hal/ar5416
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: Wed, 02 Jan 2013 03:56:20 -0000

Author: adrian
Date: Wed Jan  2 03:56:20 2013
New Revision: 244950
URL: http://svnweb.freebsd.org/changeset/base/244950

Log:
  Fix the short repeat option code to not flip the option to 0 when
  we call this w/ NOVAL set.

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c	Wed Jan  2 02:44:54 2013	(r244949)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c	Wed Jan  2 03:56:20 2013	(r244950)
@@ -113,7 +113,7 @@ ar5416ConfigureSpectralScan(struct ath_h
 
 		if (ss->ss_short_report == AH_TRUE) {
 			val |= AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
-		} else {
+		} else if (ss->ss_short_report != HAL_SPECTRAL_PARAM_NOVAL) {
 			val &= ~AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
 		}
 	} else {
@@ -130,7 +130,7 @@ ar5416ConfigureSpectralScan(struct ath_h
 
 		if (ss->ss_short_report == AH_TRUE) {
 			val |= AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
-		} else {
+		} else if (ss->ss_short_report != HAL_SPECTRAL_PARAM_NOVAL) {
 			val &= ~AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
 		}