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

Commit e9f08381 authored by Andrew Blaich's avatar Andrew Blaich Committed by John W. Linville
Browse files

ath5k: fixing retries in ath5k_hw_setup_4word_tx_desc 



The rate control algorithm, default is Minstrel for ath5k, determines
the number of retries to use for each rate.  However, there exists in
ath5k_hw_setup_4word_tx_desc (which is called for AR5212 like devices)
a set number of retries defined by AR5K_TUNE_HWTXTRIES.  The set
number of tries is added to the tx_tries0 variable setup by the rate
control algorithm.  This changes the number of retries the rate
control algorithm considers necessary.  By removing the
AR5K_TUNE_HWTXTRIES from the retry calculation the rate control
algorithm is given control over the number of retries.

Signed-off-by: default avatarAndrew Blaich <ablaich@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d969847c

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

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ 
#define AR5K_TUNE_MAX_TXPOWER			63

#define AR5K_TUNE_DEFAULT_TXPOWER		25

#define AR5K_TUNE_TPC_TXPOWER			false

#define AR5K_TUNE_HWTXTRIES			4



#define AR5K_INIT_CARR_SENSE_EN			1

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

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah, 
		AR5K_REG_SM(antenna_mode, AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT);

	tx_ctl->tx_control_1 |= AR5K_REG_SM(type,

					AR5K_4W_TX_DESC_CTL1_FRAME_TYPE);

	tx_ctl->tx_control_2 = AR5K_REG_SM(tx_tries0 + AR5K_TUNE_HWTXTRIES,

	tx_ctl->tx_control_2 = AR5K_REG_SM(tx_tries0,

					AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0);

	tx_ctl->tx_control_3 = tx_rate0 & AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;