aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-10-05 22:38:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-10-05 22:38:32 +0000
commita42d0f389e9c126420f2a16728a2116a5a27b989 (patch)
tree676eb665297c075712dc80cd050dedae47983b01
parentcb0229b494fea15d32c868a6d19acb468cef02f3 (diff)
downloadupstream-a42d0f389e9c126420f2a16728a2116a5a27b989.tar.gz
upstream-a42d0f389e9c126420f2a16728a2116a5a27b989.tar.bz2
upstream-a42d0f389e9c126420f2a16728a2116a5a27b989.zip
mac80211: add a fix to initialize the tid field in the tx queue struct
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r47142 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47144 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/mac80211/patches/398-mac80211-initialize-tid-field-in-struct-ieee80211_tx.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/398-mac80211-initialize-tid-field-in-struct-ieee80211_tx.patch b/package/kernel/mac80211/patches/398-mac80211-initialize-tid-field-in-struct-ieee80211_tx.patch
new file mode 100644
index 0000000000..1478efae77
--- /dev/null
+++ b/package/kernel/mac80211/patches/398-mac80211-initialize-tid-field-in-struct-ieee80211_tx.patch
@@ -0,0 +1,21 @@
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Mon, 5 Oct 2015 17:41:25 +0200
+Subject: [PATCH] mac80211: initialize tid field in struct ieee80211_txq
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+---
+
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -3323,9 +3323,11 @@ void ieee80211_init_tx_queue(struct ieee
+ 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;
+ }
+ }