diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-11-21 17:29:14 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-28 08:24:23 -0500 |
commit | 336004e29115e47253f7e7d007df9e1f9e73dcdd (patch) | |
tree | d5b716a03ef225bb985154525fb6b5a2a1949832 /net/mac80211/tx.c | |
parent | 24a0aa212ee2dbe44360288684478d76a8e20a0a (diff) |
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 <j@w1.fi>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 66ddbbeccd20..058686a721a1 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -60,7 +60,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, | |||
60 | rcu_read_unlock(); | 60 | rcu_read_unlock(); |
61 | 61 | ||
62 | /* assume HW handles this */ | 62 | /* assume HW handles this */ |
63 | if (tx->rate.flags & IEEE80211_TX_RC_MCS) | 63 | if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS)) |
64 | return 0; | 64 | return 0; |
65 | 65 | ||
66 | /* uh huh? */ | 66 | /* uh huh? */ |