Date: Fri, 20 Feb 2009 23:15:11 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r188874 - 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... Message-ID: <200902202315.n1KNFB2H041930@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Fri Feb 20 23:15:11 2009 New Revision: 188874 URL: http://svn.freebsd.org/changeset/base/188874 Log: merge r188865: don't adjust core clk conversions for 1/2 and 1/4 rate channels 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.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/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.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ah.c Fri Feb 20 23:14:32 2009 (r188873) +++ projects/vap7/sys/dev/ath/ath_hal/ah.c Fri Feb 20 23:15:11 2009 (r188874) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902202315.n1KNFB2H041930>