|
@@ -64,6 +64,10 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
|
|
|
struct ieee80211_chanctx_conf *chanctx_conf;
|
|
struct ieee80211_chanctx_conf *chanctx_conf;
|
|
|
u32 rate_flags = 0;
|
|
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();
|
|
rcu_read_lock();
|
|
|
chanctx_conf = rcu_dereference(tx->sdata->vif.chanctx_conf);
|
|
chanctx_conf = rcu_dereference(tx->sdata->vif.chanctx_conf);
|
|
|
if (chanctx_conf) {
|
|
if (chanctx_conf) {
|
|
@@ -72,10 +76,6 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
|
|
|
}
|
|
}
|
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
- /* assume HW handles this */
|
|
|
|
|
- if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))
|
|
|
|
|
- return 0;
|
|
|
|
|
-
|
|
|
|
|
/* uh huh? */
|
|
/* uh huh? */
|
|
|
if (WARN_ON_ONCE(tx->rate.idx < 0))
|
|
if (WARN_ON_ONCE(tx->rate.idx < 0))
|
|
|
return 0;
|
|
return 0;
|