diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-11-04 05:27:53 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2016-11-15 08:37:21 -0500 |
commit | fff712cbe38b6d4e211df9c22aabcfd9739c1c2a (patch) | |
tree | b2a8da75d21c45bc00e7cb058165b55c52ceb3b7 | |
parent | c1f4c9ede3c799da9f920c1df9ce524145781637 (diff) |
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>
-rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d08a8492a846..fb73e86bdf41 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1501,7 +1501,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local, | |||
1501 | struct sta_info *sta, | 1501 | struct sta_info *sta, |
1502 | struct sk_buff *skb) | 1502 | struct sk_buff *skb) |
1503 | { | 1503 | { |
1504 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
1505 | struct fq *fq = &local->fq; | 1504 | struct fq *fq = &local->fq; |
1506 | struct ieee80211_vif *vif; | 1505 | struct ieee80211_vif *vif; |
1507 | struct txq_info *txqi; | 1506 | struct txq_info *txqi; |
@@ -1526,8 +1525,6 @@ static bool ieee80211_queue_skb(struct ieee80211_local *local, | |||
1526 | if (!txqi) | 1525 | if (!txqi) |
1527 | return false; | 1526 | return false; |
1528 | 1527 | ||
1529 | info->control.vif = vif; | ||
1530 | |||
1531 | spin_lock_bh(&fq->lock); | 1528 | spin_lock_bh(&fq->lock); |
1532 | ieee80211_txq_enqueue(local, txqi, skb); | 1529 | ieee80211_txq_enqueue(local, txqi, skb); |
1533 | spin_unlock_bh(&fq->lock); | 1530 | spin_unlock_bh(&fq->lock); |