| Message ID | 20161104092754.91649-2-nbd@nbd.name (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
Felix Fietkau <nbd@nbd.name> writes: > 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. Yeah, I think this was leftover from earlier version when the flow was different. Or maybe I just missed it... Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> -Toke
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c380e85..390b425 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1500,7 +1500,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; @@ -1525,8 +1524,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);
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> --- net/mac80211/tx.c | 3 --- 1 file changed, 3 deletions(-)