2014-11-21 22:29:20

by Felix Fietkau

Subject: [PATCH] mac80211: add more missing checks for VHT tx rates

Fixes a crash on attempting to calculate the frame duration for a VHT
packet (which needs to be handled by hw/driver instead).

Reported-by: Jouni Malinen <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
---
net/mac80211/rate.c | 3 ++-
net/mac80211/tx.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 08ab7d6..d53355b 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -446,7 +446,8 @@ static void rate_fixup_ratelist(struct ieee80211_vif *vif,
*
* XXX: Should this check all retry rates?
*/
- if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) {
+ if (!(rates[0].flags &
+ (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))) {
u32 basic_rates = vif->bss_conf.basic_rates;
s8 baserate = basic_rates ? ffs(basic_rates) - 1 : 0;

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 66ddbbe..058686a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -60,7 +60,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
rcu_read_unlock();

/* assume HW handles this */
- if (tx->rate.flags & IEEE80211_TX_RC_MCS)
+ if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))
return 0;

/* uh huh? */
--
2.1.2

2014-11-28 13:25:40

by Johannes Berg

Subject: Re: [PATCH] mac80211: add more missing checks for VHT tx rates

On Fri, 2014-11-21 at 23:29 +0100, Felix Fietkau wrote:
> Fixes a crash on attempting to calculate the frame duration for a VHT
> packet (which needs to be handled by hw/driver instead).

Applied, thanks.

johannes