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

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

mac80211: remove bogus skb vif assignment 



The call to ieee80211_txq_enqueue overwrites the vif pointer with the
codel enqueue time, so setting it just before that call makes no sense.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Acked-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c1f4c9ed

net/mac80211/tx.c

+0 −3
Original line number Diff line number Diff line
@@ -1501,7 +1501,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local, 
				struct sta_info *sta,

				struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct fq *fq = &local->fq;

	struct ieee80211_vif *vif;

	struct txq_info *txqi;
@@ -1526,8 +1525,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local, 
	if (!txqi)

		return false;



	info->control.vif = vif;



	spin_lock_bh(&fq->lock);

	ieee80211_txq_enqueue(local, txqi, skb);

	spin_unlock_bh(&fq->lock);