leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: fix rate control tx handler for VHT rates

Browse Source 
Handle VHT rates like HT ones, otherwise we easily trigger the pre-HT
rates WARN_ON(rc_rate->idx >= sband->n_bitrates) which will set
rc_rate->idx to -1.

Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Karl Beldan 2013-04-15 18:28:21 +02:00 committed by Johannes Berg
parent 7a7da6ee0e
commit fbd647b176
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/mac80211/tx.c
View File

@ -742,16 +742,18 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
} }
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) { for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
struct ieee80211_tx_rate *rc_rate = &info->control.rates[i];
/* /*
* make sure there's no valid rate following * make sure there's no valid rate following
* an invalid one, just in case drivers don't * an invalid one, just in case drivers don't
* take the API seriously to stop at -1. * take the API seriously to stop at -1.
*/ */
if (inval) { if (inval) {
info->control.rates[i].idx = -1; rc_rate->idx = -1;
continue; continue;
} }
if (info->control.rates[i].idx < 0) { if (rc_rate->idx < 0) {
inval = true; inval = true;
continue; continue;
} }
@ -760,36 +762,37 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
* For now assume MCS is already set up correctly, this * For now assume MCS is already set up correctly, this
* needs to be fixed. * needs to be fixed.
*/ */
if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS) { if (rc_rate->flags & IEEE80211_TX_RC_MCS) {
WARN_ON(info->control.rates[i].idx > 76); WARN_ON(rc_rate->idx > 76);
continue;
}
if (rc_rate->flags & IEEE80211_TX_RC_VHT_MCS) {
WARN_ON(ieee80211_rate_get_vht_mcs(rc_rate) > 9);
continue; continue;
} }
/* set up RTS protection if desired */ /* set up RTS protection if desired */
if (rts) if (rts)
info->control.rates[i].flags |= rc_rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS;
IEEE80211_TX_RC_USE_RTS_CTS;
/* RC is busted */ /* RC is busted */
if (WARN_ON_ONCE(info->control.rates[i].idx >= if (WARN_ON_ONCE(rc_rate->idx >= sband->n_bitrates)) {
sband->n_bitrates)) { rc_rate->idx = -1;
info->control.rates[i].idx = -1;
continue; continue;
} }
rate = &sband->bitrates[info->control.rates[i].idx]; rate = &sband->bitrates[rc_rate->idx];
/* set up short preamble */ /* set up short preamble */
if (short_preamble && if (short_preamble &&
rate->flags & IEEE80211_RATE_SHORT_PREAMBLE) rate->flags & IEEE80211_RATE_SHORT_PREAMBLE)
info->control.rates[i].flags |= rc_rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE;
IEEE80211_TX_RC_USE_SHORT_PREAMBLE;
/* set up G protection */ /* set up G protection */
if (!rts && tx->sdata->vif.bss_conf.use_cts_prot && if (!rts && tx->sdata->vif.bss_conf.use_cts_prot &&
rate->flags & IEEE80211_RATE_ERP_G) rate->flags & IEEE80211_RATE_ERP_G)
info->control.rates[i].flags |= rc_rate->flags |= IEEE80211_TX_RC_USE_CTS_PROTECT;
IEEE80211_TX_RC_USE_CTS_PROTECT;
} }
return TX_CONTINUE; return TX_CONTINUE;