35 lines
919 B
Diff
35 lines
919 B
Diff
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Wed, 14 Dec 2016 20:12:25 +0100
|
||
|
|
Subject: [PATCH] mac80211: check for MCS in ieee80211_duration before fetching
|
||
|
|
chanctx
|
||
|
|
|
||
|
|
Makes the code a bit more efficient
|
||
|
|
|
||
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/net/mac80211/tx.c
|
||
|
|
+++ b/net/mac80211/tx.c
|
||
|
|
@@ -63,6 +63,10 @@ static __le16 ieee80211_duration(struct
|
||
|
|
struct ieee80211_chanctx_conf *chanctx_conf;
|
||
|
|
u32 rate_flags = 0;
|
||
|
|
|
||
|
|
+ /* assume HW handles this */
|
||
|
|
+ if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))
|
||
|
|
+ return 0;
|
||
|
|
+
|
||
|
|
rcu_read_lock();
|
||
|
|
chanctx_conf = rcu_dereference(tx->sdata->vif.chanctx_conf);
|
||
|
|
if (chanctx_conf) {
|
||
|
|
@@ -71,10 +75,6 @@ static __le16 ieee80211_duration(struct
|
||
|
|
}
|
||
|
|
rcu_read_unlock();
|
||
|
|
|
||
|
|
- /* assume HW handles this */
|
||
|
|
- if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
/* uh huh? */
|
||
|
|
if (WARN_ON_ONCE(tx->rate.idx < 0))
|
||
|
|
return 0;
|