svn commit: r188804 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Thu Feb 19 06:02:31 2009
New Revision: 188804
URL: http://svn.freebsd.org/changeset/base/188804

Log:
  merge r188012: unbreak ar2425

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212.h
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)

Modified: projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212.h
==============================================================================
--- projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212.h	Thu Feb 19 06:01:26 2009	(r188803)
+++ projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212.h	Thu Feb 19 06:02:31 2009	(r188804)
@@ -398,10 +398,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;	\
 	}							\