فهرست منبع

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: Felix Fietkau <nbd@nbd.name>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Felix Fietkau 8 سال پیش
والد
کامیت
fff712cbe3
1فایلهای تغییر یافته به همراه0 افزوده شده و 3 حذف شده
  1. 0 3
      net/mac80211/tx.c

+ 0 - 3
net/mac80211/tx.c

@@ -1501,7 +1501,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local,
 				struct sta_info *sta,
 				struct sta_info *sta,
 				struct sk_buff *skb)
 				struct sk_buff *skb)
 {
 {
-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 	struct fq *fq = &local->fq;
 	struct fq *fq = &local->fq;
 	struct ieee80211_vif *vif;
 	struct ieee80211_vif *vif;
 	struct txq_info *txqi;
 	struct txq_info *txqi;
@@ -1526,8 +1525,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local,
 	if (!txqi)
 	if (!txqi)
 		return false;
 		return false;
 
 
-	info->control.vif = vif;
-
 	spin_lock_bh(&fq->lock);
 	spin_lock_bh(&fq->lock);
 	ieee80211_txq_enqueue(local, txqi, skb);
 	ieee80211_txq_enqueue(local, txqi, skb);
 	spin_unlock_bh(&fq->lock);
 	spin_unlock_bh(&fq->lock);