Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95cd470c authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: check for MCS in ieee80211_duration before fetching chanctx 



Makes the code a bit more efficient

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 70550df2

net/mac80211/tx.c

+4 −4
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, 
	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) {
@@ -72,10 +76,6 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, 
	}

	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;