From: Nick Kossifidis Date: Tue, 23 Nov 2010 19:48:32 +0000 (+0200) Subject: ath5k: Use correct clock when setting ofdm timings X-Git-Tag: 2.1b_release~5947^2~169^2^2~122 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73a06a683455f472cc09ad249064c66a41e29e39;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git ath5k: Use correct clock when setting ofdm timings * Use correct clock value when setting OFDM timings on non-default bwmodes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 31239ab..95b602b 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -228,8 +228,20 @@ static inline int ath5k_hw_write_ofdm_timings(struct ath5k_hw *ah, * ALGO: coef = (5 * clock / carrier_freq) / 2 * we scale coef by shifting clock value by 24 for * better precision since we use integers */ - /* TODO: Half/quarter rate */ - clock = (channel->hw_value & CHANNEL_TURBO) ? 80 : 40; + switch (ah->ah_bwmode) { + case AR5K_BWMODE_40MHZ: + clock = 40 * 2; + break; + case AR5K_BWMODE_10MHZ: + clock = 40 / 2; + break; + case AR5K_BWMODE_5MHZ: + clock = 40 / 4; + break; + default: + clock = 40; + break; + } coef_scaled = ((5 * (clock << 24)) / 2) / channel->center_freq; /* Get exponent