diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-11-10 22:24:51 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-11-10 22:25:27 +0100 |
| commit | 49f615022c921189ff4566b8b2bfdbf97a2a8787 (patch) | |
| tree | fab3197b760b912514e9bd9ea7b8e93c77bc65f3 /package/kernel | |
| parent | a564e1df52327ad0548bb7fba583e4194da78a4a (diff) | |
| download | upstream-49f615022c921189ff4566b8b2bfdbf97a2a8787.tar.gz upstream-49f615022c921189ff4566b8b2bfdbf97a2a8787.tar.bz2 upstream-49f615022c921189ff4566b8b2bfdbf97a2a8787.zip | |
mac80211: fix queue selection issue
When __ieee80211_select_queue is called, skb->cb has not been cleared yet,
which means that info->control.flags can contain garbage.
In some cases this leads to IEEE80211_TX_CTRL_DONT_REORDER being set, causing
packets marked for other queues to randomly end up in BE instead.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/300-mac80211-drop-check-for-DONT_REORDER-in-__ieee80211_.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/subsys/300-mac80211-drop-check-for-DONT_REORDER-in-__ieee80211_.patch b/package/kernel/mac80211/patches/subsys/300-mac80211-drop-check-for-DONT_REORDER-in-__ieee80211_.patch new file mode 100644 index 0000000000..b55da2b1aa --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/300-mac80211-drop-check-for-DONT_REORDER-in-__ieee80211_.patch @@ -0,0 +1,37 @@ +From: Felix Fietkau <nbd@nbd.name> +Date: Wed, 10 Nov 2021 22:17:13 +0100 +Subject: [PATCH] mac80211: drop check for DONT_REORDER in + __ieee80211_select_queue + +When __ieee80211_select_queue is called, skb->cb has not been cleared yet, +which means that info->control.flags can contain garbage. +In some cases this leads to IEEE80211_TX_CTRL_DONT_REORDER being set, causing +packets marked for other queues to randomly end up in BE instead. + +This flag only needs to be checked in ieee80211_select_queue_80211, since +the radiotap parser is the only piece of code that sets it + +Fixes: 66d06c84730c ("mac80211: adhere to Tx control flag that prevents frame reordering") +Cc: stable@vger.kernel.org +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + +--- a/net/mac80211/wme.c ++++ b/net/mac80211/wme.c +@@ -143,7 +143,6 @@ u16 ieee80211_select_queue_80211(struct + u16 __ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, + struct sta_info *sta, struct sk_buff *skb) + { +- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct mac80211_qos_map *qos_map; + bool qos; + +@@ -156,7 +155,7 @@ u16 __ieee80211_select_queue(struct ieee + else + qos = false; + +- if (!qos || (info->control.flags & IEEE80211_TX_CTRL_DONT_REORDER)) { ++ if (!qos) { + skb->priority = 0; /* required for correct WPA/11i MIC */ + return IEEE80211_AC_BE; + } |