Updating the patch to include the removal of the define of AR5K_TUNE_HWTXTRIES per Benoit's suggestion as the patch makes it no longer necessary. Signed-off-by:: Andrew Blaich <ablaich@xxxxxxxxx> --- 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; On Wed, Mar 3, 2010 at 6:30 PM, Bob Copeland <me@xxxxxxxxxxxxxxx> wrote: > On Mon, Mar 1, 2010 at 10:30 AM, Andrew Blaich <ablaich@xxxxxxxxx> wrote: >> This Patch: >> >> 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:: Andrew Blaich <ablaich@xxxxxxxxx> >> --- >> 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, > > Thanks! > > -- > Bob Copeland %% www.bobcopeland.com > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
