The following commit has been merged in the batman-adv/next branch: commit f8a87017f4a9f1638df54dd79d0f5ad1bae51c1d Author: Sujith Manoharan c_manoha@qca.qualcomm.com Date: Fri Aug 10 16:47:16 2012 +0530

ath9k: Remove MIMO-PS specific code

Signed-off-by: Sujith Manoharan c_manoha@qca.qualcomm.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 2051fac..cce0c51 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c @@ -1120,15 +1120,6 @@ static void ath_rc_tx_status(struct ath_softc *sc, rates[i].count); } } - } else { - /* - * Handle the special case of MIMO PS burst, where the second - * aggregate is sent out with only one rate and one try. - * Treating it as an excessive retry penalizes the rate - * inordinately. - */ - if (rates[0].count == 1 && xretries == 1) - xretries = 2; }

flags = rates[final_ts_idx].flags;