diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-11-04 10:27:53 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-11-15 14:37:21 +0100 |
| commit | fff712cbe38b6d4e211df9c22aabcfd9739c1c2a (patch) | |
| tree | b2a8da75d21c45bc00e7cb058165b55c52ceb3b7 | |
| parent | c1f4c9ede3c799da9f920c1df9ce524145781637 (diff) | |
| download | linux-stable-fff712cbe38b6d4e211df9c22aabcfd9739c1c2a.tar.gz linux-stable-fff712cbe38b6d4e211df9c22aabcfd9739c1c2a.tar.bz2 linux-stable-fff712cbe38b6d4e211df9c22aabcfd9739c1c2a.zip | |
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, 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); |