summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2009-02-02 16:56:58 +0000
committersam <sam@FreeBSD.org>2009-02-02 16:56:58 +0000
commit286b1aea9dca17ec0ddf351a096c7530fc43f114 (patch)
tree341c9ca406332e99aa4761949d7fa193494667de
parentcf42d4143e8c005227acd69be32897dd0f159b8a (diff)
downloadFreeBSD-src-286b1aea9dca17ec0ddf351a096c7530fc43f114.zip
FreeBSD-src-286b1aea9dca17ec0ddf351a096c7530fc43f114.tar.gz
o make SAVE_CCK slightly less error prone by always writing the _flag
value used later by RESTORE_CCK o swap arg order in RESTORE_CCK to slightly reduce cost
-rw-r--r--sys/dev/ath/ath_hal/ar5212/ar5212.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212.h b/sys/dev/ath/ath_hal/ar5212/ar5212.h
index c73b68c..e0edcf6 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212.h
@@ -399,10 +399,11 @@ struct ath_hal_5212 {
(_chan)->ic_flags &= ~IEEE80211_CHAN_CCK; \
(_chan)->ic_flags |= IEEE80211_CHAN_DYN; \
(_flag) = AH_TRUE; \
- } \
+ } else \
+ (_flag) = AH_FALSE; \
} while (0)
#define RESTORE_CCK(_ah, _chan, _flag) do { \
- if ((IS_2425(_ah) || IS_2417(_ah)) && (_flag)) { \
+ if ((_flag) && (IS_2425(_ah) || IS_2417(_ah))) { \
(_chan)->ic_flags &= ~IEEE80211_CHAN_DYN; \
(_chan)->ic_flags |= IEEE80211_CHAN_CCK; \
} \
OpenPOWER on IntegriCloud