forked from openwrt/openwrt
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mac80211: fix mesh queue selection issue
Signed-off-by: Felix Fietkau <nbd@nbd.name>
- Loading branch information
Showing
1 changed file
with
28 additions
and
0 deletions.
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
...el/mac80211/patches/subsys/337-mac80211-fix-queue-selection-for-mesh-OCB-interfaces.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From: Felix Fietkau <nbd@nbd.name> | ||
Date: Sat, 2 Jul 2022 16:41:32 +0200 | ||
Subject: [PATCH] mac80211: fix queue selection for mesh/OCB interfaces | ||
|
||
When using iTXQ, the code assumes that there is only one vif queue for | ||
broadcast packets, using the BE queue. Allowing non-BE queue marking | ||
violates that assumption and txq->ac == skb_queue_mapping is no longer | ||
guaranteed. This can cause issues with queue handling in the driver and | ||
also causes issues with the recent ATF change, resulting in an AQL | ||
underflow warning. | ||
|
||
Cc: stable@vger.kernel.org | ||
Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||
--- | ||
|
||
--- a/net/mac80211/wme.c | ||
+++ b/net/mac80211/wme.c | ||
@@ -147,8 +147,8 @@ u16 __ieee80211_select_queue(struct ieee | ||
bool qos; | ||
|
||
/* all mesh/ocb stations are required to support WME */ | ||
- if (sdata->vif.type == NL80211_IFTYPE_MESH_POINT || | ||
- sdata->vif.type == NL80211_IFTYPE_OCB) | ||
+ if (sta && (sdata->vif.type == NL80211_IFTYPE_MESH_POINT || | ||
+ sdata->vif.type == NL80211_IFTYPE_OCB)) | ||
qos = true; | ||
else if (sta) | ||
qos = sta->sta.wme; |