aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-10-06 00:16:53 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-10-08 11:10:50 +0200
commit4d57c67827d7bb79c4fcf6618bf80930808e50c6 (patch)
tree2779a8f41f5d5d115a09896d72715070293e58be /net/mac80211
parentmac80211: make ieee80211_new_mesh_header return unsigned (diff)
downloadlinux-dev-4d57c67827d7bb79c4fcf6618bf80930808e50c6.tar.xz
linux-dev-4d57c67827d7bb79c4fcf6618bf80930808e50c6.zip
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/util.c2
1 files changed, 2 insertions, 0 deletions
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;
}
}