mac80211: backport cfg80211 support for ieee80211-freq-limit DT property
[lede.git] / package / kernel / mac80211 / patches / 323-mac80211-remove-bogus-skb-vif-assignment.patch
1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Fri, 4 Nov 2016 10:17:38 +0100
3 Subject: [PATCH] mac80211: remove bogus skb vif assignment
4
5 The call to ieee80211_txq_enqueue overwrites the vif pointer with the
6 codel enqueue time, so setting it just before that call makes no sense.
7
8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 ---
10
11 --- a/net/mac80211/tx.c
12 +++ b/net/mac80211/tx.c
13 @@ -1500,7 +1500,6 @@ static bool ieee80211_queue_skb(struct i
14                                 struct sta_info *sta,
15                                 struct sk_buff *skb)
16  {
17 -       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
18         struct fq *fq = &local->fq;
19         struct ieee80211_vif *vif;
20         struct txq_info *txqi;
21 @@ -1525,8 +1524,6 @@ static bool ieee80211_queue_skb(struct i
22         if (!txqi)
23                 return false;
24  
25 -       info->control.vif = vif;
26 -
27         spin_lock_bh(&fq->lock);
28         ieee80211_txq_enqueue(local, txqi, skb);
29         spin_unlock_bh(&fq->lock);