From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 5 Oct 2015 22:16:53 +0000 (+0200)
Subject: mac80211: add missing struct ieee80211_txq tid field initialization
X-Git-Tag: firefly_0821_release~176^2~818^2~85^2~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d57c67827d7bb79c4fcf6618bf80930808e50c6;p=firefly-linux-kernel-4.4.55.git

mac80211: add missing struct ieee80211_txq tid field initialization

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 60c4dbf92625..fb6e511ee0be 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3301,9 +3301,11 @@ void ieee80211_init_tx_queue(struct ieee80211_sub_if_data *sdata,
 	if (sta) {
 		txqi->txq.sta = &sta->sta;
 		sta->sta.txq[tid] = &txqi->txq;
+		txqi->txq.tid = tid;
 		txqi->txq.ac = ieee802_1d_to_ac[tid & 7];
 	} else {
 		sdata->vif.txq = &txqi->txq;
+		txqi->txq.tid = 0;
 		txqi->txq.ac = IEEE80211_AC_BE;
 	}
 }