diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-11-21 23:29:14 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-28 14:24:23 +0100 |
commit | 336004e29115e47253f7e7d007df9e1f9e73dcdd (patch) | |
tree | d5b716a03ef225bb985154525fb6b5a2a1949832 /net/mac80211/tx.c | |
parent | 24a0aa212ee2dbe44360288684478d76a8e20a0a (diff) | |
download | op-kernel-dev-336004e29115e47253f7e7d007df9e1f9e73dcdd.zip op-kernel-dev-336004e29115e47253f7e7d007df9e1f9e73dcdd.tar.gz |
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 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? */ |