Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 6 Jan 2012 22:18:13 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r229740 - in stable/9/sys/dev/ath/ath_hal: ar5212 ar5416
Message-ID:  <201201062218.q06MIDGe010975@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Fri Jan  6 22:18:13 2012
New Revision: 229740
URL: http://svn.freebsd.org/changeset/base/229740

Log:
  MFC r228817:
  
  Use the correct types when calling the decompression mask function.
  
  There's currently no public code which uses this feature and the
  current reference driver doesn't enable this feature at all.
  It's possible it was used by a previous version of the driver and
  that indeed it should return HAL_STATUS; but at this point I'm
  happy to require that they complain and submit a patch.
  
  This was found by LLVM compile-time type checking.

Modified:
  stable/9/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- stable/9/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Fri Jan  6 22:15:58 2012	(r229739)
+++ stable/9/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Fri Jan  6 22:18:13 2012	(r229740)
@@ -573,7 +573,7 @@ ar5212SetDecompMask(struct ath_hal *ah, 
 	struct ath_hal_5212 *ahp = AH5212(ah);
 
         if (keyidx >= HAL_DECOMP_MASK_SIZE)
-                return HAL_EINVAL; 
+                return AH_FALSE;
         OS_REG_WRITE(ah, AR_DCM_A, keyidx);
         OS_REG_WRITE(ah, AR_DCM_D, en ? AR_DCM_D_EN : 0);
         ahp->ah_decompMask[keyidx] = en;

Modified: stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==============================================================================
--- stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Fri Jan  6 22:15:58 2012	(r229739)
+++ stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c	Fri Jan  6 22:18:13 2012	(r229740)
@@ -155,7 +155,7 @@ ar5416SetAntennaSwitch(struct ath_hal *a
 HAL_BOOL
 ar5416SetDecompMask(struct ath_hal *ah, uint16_t keyidx, int en)
 {
-	return HAL_OK;
+	return AH_TRUE;
 }
 
 /* Setup coverage class */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201062218.q06MIDGe010975>