svn commit: r188926 - 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: Sun Feb 22 18:52:51 2009
New Revision: 188926
URL: http://svn.freebsd.org/changeset/base/188926

Log:
  merge r188924: display min/max dwell times in msecs in debug msgs

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/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)
  projects/vap7/sys/net80211/ieee80211_scan.c

Modified: projects/vap7/sys/net80211/ieee80211_scan.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_scan.c	Sun Feb 22 18:48:54 2009	(r188925)
+++ projects/vap7/sys/net80211/ieee80211_scan.c	Sun Feb 22 18:52:51 2009	(r188926)
@@ -346,7 +346,8 @@ scan_dump(struct ieee80211_scan_state *s
 
 	if_printf(vap->iv_ifp, "scan set ");
 	ieee80211_scan_dump_channels(ss);
-	printf(" dwell min %lu max %lu\n", ss->ss_mindwell, ss->ss_maxdwell);
+	printf(" dwell min %lums max %lums\n",
+	    ticks_to_msecs(ss->ss_mindwell), ticks_to_msecs(ss->ss_maxdwell));
 }
 #endif /* IEEE80211_DEBUG */
 
@@ -919,7 +920,7 @@ again:
 			maxdwell = ss->ss_maxdwell;
 
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
-		    "%s: chan %3d%c -> %3d%c [%s, dwell min %lu max %lu]\n",
+		    "%s: chan %3d%c -> %3d%c [%s, dwell min %lums max %lums]\n",
 		    __func__,
 		    ieee80211_chan2ieee(ic, ic->ic_curchan),
 		        channel_type(ic->ic_curchan),
@@ -927,7 +928,7 @@ again:
 		    (ss->ss_flags & IEEE80211_SCAN_ACTIVE) &&
 			(chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0 ?
 			"active" : "passive",
-		    ss->ss_mindwell, maxdwell);
+		    ticks_to_msecs(ss->ss_mindwell), ticks_to_msecs(maxdwell));
 
 		/*
 		 * Potentially change channel and phy mode.