openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath5k: store the clock rate in common data on channel changes 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau 2010-10-08 22:13:52 +02:00 committed by John W. Linville
parent dfdac8ac03
commit 9d119f3ebd
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath5k/ath5k.h
View File

@ -1201,7 +1201,7 @@ void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high);
/* Clock rate related functions */ /* Clock rate related functions */
unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec); unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec);
unsigned int ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock); unsigned int ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock);
unsigned int ath5k_hw_get_clockrate(struct ath5k_hw *ah); void ath5k_hw_set_clockrate(struct ath5k_hw *ah);
/* Queue Control Unit, DFS Control Unit Functions */ /* Queue Control Unit, DFS Control Unit Functions */
int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue, int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,

13
drivers/net/wireless/ath/ath5k/pcu.c
View File

@ -207,7 +207,8 @@ static int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
*/ */
unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec) unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec)
{ {
return usec * ath5k_hw_get_clockrate(ah); struct ath_common *common = ath5k_hw_common(ah);
return usec * common->clockrate;
} }
/** /**
@ -216,17 +217,19 @@ unsigned int ath5k_hw_htoclock(struct ath5k_hw *ah, unsigned int usec)
*/ */
unsigned int ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock) unsigned int ath5k_hw_clocktoh(struct ath5k_hw *ah, unsigned int clock)
{ {
return clock / ath5k_hw_get_clockrate(ah); struct ath_common *common = ath5k_hw_common(ah);
return clock / common->clockrate;
} }
/** /**
* ath5k_hw_get_clockrate - Get the clock rate for current mode * ath5k_hw_set_clockrate - Set common->clockrate for the current channel
* *
* @ah: The &struct ath5k_hw * @ah: The &struct ath5k_hw
*/ */
unsigned int ath5k_hw_get_clockrate(struct ath5k_hw *ah) void ath5k_hw_set_clockrate(struct ath5k_hw *ah)
{ {
struct ieee80211_channel *channel = ah->ah_current_channel; struct ieee80211_channel *channel = ah->ah_current_channel;
struct ath_common *common = ath5k_hw_common(ah);
int clock; int clock;
if (channel->hw_value & CHANNEL_5GHZ) if (channel->hw_value & CHANNEL_5GHZ)
@ -240,7 +243,7 @@ unsigned int ath5k_hw_get_clockrate(struct ath5k_hw *ah)
if (channel->hw_value & CHANNEL_TURBO) if (channel->hw_value & CHANNEL_TURBO)
clock *= 2; clock *= 2;
return clock; common->clockrate = clock;
} }
/** /**

1
drivers/net/wireless/ath/ath5k/phy.c
View File

@ -1093,6 +1093,7 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel)
ah->ah_current_channel = channel; ah->ah_current_channel = channel;
ah->ah_turbo = channel->hw_value == CHANNEL_T ? true : false; ah->ah_turbo = channel->hw_value == CHANNEL_T ? true : false;
ath5k_hw_set_clockrate(ah);
return 0; return 0;
} }