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

ath9k: Do not set IEEE80211_TX_RC_USE_SHORT_PREAMBLE

mac80211 does it for us.

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 ed48d3d..78192c1 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c @@ -682,8 +682,6 @@ static void ath_rc_rate_set_series(const struct ath_rate_table *rate_table, rate->count = tries; rate->idx = rate_table->info[rix].ratecode;

- if (txrc->short_preamble) - rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE; if (txrc->rts || rtsctsenable) rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS;