svn commit: r209011 - stable/8/sys/dev/ath/ath_hal/ar5211

[Rui Paulo]

Author: rpaulo
Date: Thu Jun 10 20:34:22 2010
New Revision: 209011
URL: http://svn.freebsd.org/changeset/base/209011

Log:
  MFC r208644:
   Due to the way HALDEBUG() is defined, we need to add curly brackets
   when using it as a sole if clause instruction.
   While there, fix 'const static' typo.
  
  Submitted by:	Arnaud Lacombe <alc at FreeBSD.org>
  Approved by:	re (kensmith)

Modified:
  stable/8/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
==============================================================================
--- stable/8/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c	Thu Jun 10 20:28:42 2010	(r209010)
+++ stable/8/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c	Thu Jun 10 20:34:22 2010	(r209011)
@@ -46,7 +46,7 @@ typedef struct {
 } CHAN_INFO_2GHZ;
 
 #define CI_2GHZ_INDEX_CORRECTION 19
-const static CHAN_INFO_2GHZ chan2GHzData[] = {
+static const CHAN_INFO_2GHZ chan2GHzData[] = {
 	{ 1, 0x46, 96  },	/* 2312 -19 */
 	{ 1, 0x46, 97  },	/* 2317 -18 */
 	{ 1, 0x46, 98  },	/* 2322 -17 */
@@ -926,9 +926,10 @@ ar5211IsNfGood(struct ath_hal *ah, struc
 
 	if (!getNoiseFloorThresh(ah, chan, &nfThresh))
 		return AH_FALSE;
-	if (OS_REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF)
+	if (OS_REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) {
 		HALDEBUG(ah, HAL_DEBUG_ANY,
 		    "%s: NF did not complete in calibration window\n", __func__);
+	}
 	nf = ar5211GetNoiseFloor(ah);
 	if (nf > nfThresh) {
 		HALDEBUG(ah, HAL_DEBUG_ANY,