git.openwrt.org Git - openwrt/staging/mans0n.git/blob

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Wed, 10 Nov 2021 22:17:13 +0100
   3 Subject: [PATCH] mac80211: drop check for DONT_REORDER in
   4  __ieee80211_select_queue
   5
   6 When __ieee80211_select_queue is called, skb->cb has not been cleared yet,
   7 which means that info->control.flags can contain garbage.
   8 In some cases this leads to IEEE80211_TX_CTRL_DONT_REORDER being set, causing
   9 packets marked for other queues to randomly end up in BE instead.
  10
  11 This flag only needs to be checked in ieee80211_select_queue_80211, since
  12 the radiotap parser is the only piece of code that sets it
  13
  14 Fixes: 66d06c84730c ("mac80211: adhere to Tx control flag that prevents frame reordering")
  15 Cc: stable@vger.kernel.org
  16 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  17 ---
  18
  19 --- a/net/mac80211/wme.c
  20 +++ b/net/mac80211/wme.c
  21 @@ -143,7 +143,6 @@ u16 ieee80211_select_queue_80211(struct
  22  u16 __ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
  23                              struct sta_info *sta, struct sk_buff *skb)
  24  {
  25 -       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
  26         struct mac80211_qos_map *qos_map;
  27         bool qos;
  28
  29 @@ -156,7 +155,7 @@ u16 __ieee80211_select_queue(struct ieee
  30         else
  31                 qos = false;
  32
  33 -       if (!qos || (info->control.flags & IEEE80211_TX_CTRL_DONT_REORDER)) {
  34 +       if (!qos) {
  35                 skb->priority = 0; /* required for correct WPA/11i MIC */
  36                 return IEEE80211_AC_BE;
  37         }