Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d119f3e authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

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



Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dfdac8ac

drivers/net/wireless/ath/ath5k/ath5k.h

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high); 
/* Clock rate related functions */

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_get_clockrate(struct ath5k_hw *ah);

void ath5k_hw_set_clockrate(struct ath5k_hw *ah);



/* Queue Control Unit, DFS Control Unit Functions */

int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,

drivers/net/wireless/ath/ath5k/pcu.c

+8 −5
Original line number Diff line number Diff line
@@ -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)

{

	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)

{

	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

 */

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 ath_common *common = ath5k_hw_common(ah);

	int clock;



	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)

		clock *= 2;



	return clock;

	common->clockrate = clock;

}



/**

drivers/net/wireless/ath/ath5k/phy.c

+1 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel) 


	ah->ah_current_channel = channel;

	ah->ah_turbo = channel->hw_value == CHANNEL_T ? true : false;

	ath5k_hw_set_clockrate(ah);



	return 0;

}