svn commit: r188865 - head/sys/dev/ath/ath_hal

[Sam Leffler]

Author: sam
Date: Fri Feb 20 22:05:08 2009
New Revision: 188865
URL: http://svn.freebsd.org/changeset/base/188865

Log:
  don't adjust core clk conversions for 1/2 and 1/4 rate channels; the
  mac runs at full speed so doing this breaks conversion for ifs parameters
  
  Submitted by:	Felix Fietkau <nbd at openwrt.org>

Modified:
  head/sys/dev/ath/ath_hal/ah.c

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Fri Feb 20 21:57:05 2009	(r188864)
+++ head/sys/dev/ath/ath_hal/ah.c	Fri Feb 20 22:05:08 2009	(r188865)
@@ -266,10 +266,6 @@ ath_hal_mac_clks(struct ath_hal *ah, u_i
 		clks = usecs * CLOCK_RATE[ath_hal_chan2wmode(ah, c)];
 		if (IEEE80211_IS_CHAN_HT40(c))
 			clks <<= 1;
-		else if (IEEE80211_IS_CHAN_HALF(c))
-			clks >>= 1;
-		else if (IEEE80211_IS_CHAN_QUARTER(c))
-			clks >>= 2;
 	} else
 		clks = usecs * CLOCK_RATE[WIRELESS_MODE_11b];
 	return clks;
@@ -286,10 +282,6 @@ ath_hal_mac_usec(struct ath_hal *ah, u_i
 		usec = clks / CLOCK_RATE[ath_hal_chan2wmode(ah, c)];
 		if (IEEE80211_IS_CHAN_HT40(c))
 			usec >>= 1;
-		else if (IEEE80211_IS_CHAN_HALF(c))
-			usec <<= 1;
-		else if (IEEE80211_IS_CHAN_QUARTER(c))
-			usec <<= 2;
 	} else
 		usec = clks / CLOCK_RATE[WIRELESS_MODE_11b];
 	return usec;