2010-03-15 20:00:53

by Andrew Blaich

Subject: [PATCH] ath5k: retries in ath5k_hw_setup_4word_tx_desc

Removing AR5K_TUNE_HWTXTRIES from the Ath5k code, it adds 4
retries to tx_tries0. By removing AR5K_TUNE_HWTXTRIES, the rate
control algorithm is given full control over the retry count.

Signed-off-by:: Andrew Blaich <[email protected]>
---
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h
b/drivers/net/wireless/ath/ath5k/ath5k.h
index ac67f02..1c5834a 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -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

diff --git a/drivers/net/wireless/ath/ath5k/desc.c
b/drivers/net/wireless/ath/ath5k/desc.c
index dc30a2b..c18d8d4 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -229,7 +229,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;

2010-03-16 12:13:32

by Bob Copeland

Subject: Re: [PATCH] ath5k: retries in ath5k_hw_setup_4word_tx_desc

On Mon, Mar 15, 2010 at 04:00:49PM -0400, Andrew Blaich wrote:
> Removing AR5K_TUNE_HWTXTRIES from the Ath5k code, it adds 4
> retries to tx_tries0. By removing AR5K_TUNE_HWTXTRIES, the rate
> control algorithm is given full control over the retry count.
>
> Signed-off-by:: Andrew Blaich <[email protected]>

I believe John has already picked up the patch into wireless-testing.

Thanks for the submission!
--
Bob Copeland %% http://www.bobcopeland.com