svn commit: r188803 - 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:01:26 2009
New Revision: 188803
URL: http://svn.freebsd.org/changeset/base/188803

Log:
  merge r188084: fix building w/ AH_DEBUG

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/ah_regdomain.c
  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/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
  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/ah_regdomain.c
==============================================================================
--- projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c	Thu Feb 19 05:59:50 2009	(r188802)
+++ projects/vap7/sys/dev/ath/ath_hal/ah_regdomain.c	Thu Feb 19 06:01:26 2009	(r188803)
@@ -2233,7 +2233,7 @@ assignPrivateChannels(struct ath_hal *ah
 			/* new entry, assign a private channel entry */
 			if (next >= N(AH_PRIVATE(ah)->ah_channels)) {
 				HALDEBUG(ah, HAL_DEBUG_ANY,
-				    "%s: too many channels, max %u\n",
+				    "%s: too many channels, max %zu\n",
 				    __func__, N(AH_PRIVATE(ah)->ah_channels));
 				return AH_FALSE;
 			}

Modified: projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
==============================================================================
--- projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c	Thu Feb 19 05:59:50 2009	(r188802)
+++ projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c	Thu Feb 19 06:01:26 2009	(r188803)
@@ -392,7 +392,7 @@ ar5416PerCalibrationN(struct ath_hal *ah
 	HAL_CAL_LIST *currCal = cal->cal_curr;
 	HAL_CHANNEL_INTERNAL *ichan;
 
-	OS_MARK(ah, AH_MARK_PERCAL, chan->channel);
+	OS_MARK(ah, AH_MARK_PERCAL, chan->ic_freq);
 
 	*isCalDone = AH_TRUE;