338-mac80211-fix-queue-selection-for-mesh-OCB-interfaces.patch 1.0 KB

12345678910111213141516171819202122232425262728
  1. From: Felix Fietkau <[email protected]>
  2. Date: Sat, 2 Jul 2022 16:41:32 +0200
  3. Subject: [PATCH] mac80211: fix queue selection for mesh/OCB interfaces
  4. When using iTXQ, the code assumes that there is only one vif queue for
  5. broadcast packets, using the BE queue. Allowing non-BE queue marking
  6. violates that assumption and txq->ac == skb_queue_mapping is no longer
  7. guaranteed. This can cause issues with queue handling in the driver and
  8. also causes issues with the recent ATF change, resulting in an AQL
  9. underflow warning.
  10. Cc: [email protected]
  11. Signed-off-by: Felix Fietkau <[email protected]>
  12. ---
  13. --- a/net/mac80211/wme.c
  14. +++ b/net/mac80211/wme.c
  15. @@ -147,8 +147,8 @@ u16 __ieee80211_select_queue(struct ieee
  16. bool qos;
  17. /* all mesh/ocb stations are required to support WME */
  18. - if (sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
  19. - sdata->vif.type == NL80211_IFTYPE_OCB)
  20. + if (sta && (sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
  21. + sdata->vif.type == NL80211_IFTYPE_OCB))
  22. qos = true;
  23. else if (sta)
  24. qos = sta->sta.wme;