All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Cc: toke@toke.dk, johannes@sipsolutions.net
Subject: [PATCH 2/3] mac80211: remove bogus skb vif assignment
Date: Fri,  4 Nov 2016 10:27:53 +0100	[thread overview]
Message-ID: <20161104092754.91649-2-nbd@nbd.name> (raw)
In-Reply-To: <20161104092754.91649-1-nbd@nbd.name>

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(-)

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);
-- 
2.10.1

  reply	other threads:[~2016-11-04  9:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-04  9:27 [PATCH 1/3] mac80211: update A-MPDU flag on tx dequeue Felix Fietkau
2016-11-04  9:27 ` Felix Fietkau [this message]
2016-11-04 11:47   ` [PATCH 2/3] mac80211: remove bogus skb vif assignment Toke Høiland-Jørgensen
2016-11-04  9:27 ` [PATCH 3/3] mac80211: fix A-MSDU aggregation with fast-xmit + txq Felix Fietkau
2016-11-04 11:49   ` Toke Høiland-Jørgensen
2016-11-04 11:46 ` [PATCH 1/3] mac80211: update A-MPDU flag on tx dequeue Toke Høiland-Jørgensen
2016-11-15 13:38 ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161104092754.91649-2-nbd@nbd.name \
    --to=nbd@nbd.name \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=toke@toke.dk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.