svn commit: r244950 - head/sys/dev/ath/ath_hal/ar5416

Adrian Chadd adrian at FreeBSD.org
Wed Jan 2 03:56:20 UTC 2013


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;
 		}
 


More information about the svn-src-all mailing list