diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-05-29 16:14:02 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-05-29 16:14:02 +0000 |
| commit | e9869620a0a829b328eecad1040fb7825c5aaf2c (patch) | |
| tree | 1117a7d282959d50c16ce1c366745c5cd766314c /sys/dev/ath/ath_hal | |
| parent | 87ed7ad6eccce967f3c26f6d423eb2ec6e29b40b (diff) | |
| download | FreeBSD-src-e9869620a0a829b328eecad1040fb7825c5aaf2c.zip FreeBSD-src-e9869620a0a829b328eecad1040fb7825c5aaf2c.tar.gz | |
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@FreeBSD.org>
MFC after: 1 week
Diffstat (limited to 'sys/dev/ath/ath_hal')
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5211/ar5211_reset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c b/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c index 438bf5c..d250181 100644 --- a/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c +++ b/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c @@ -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, struct ieee80211_channel *chan) 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, |
