Skip to content

Commit 7349d13

Browse files
nbd168smb49
authored andcommitted
wifi: mac80211: fix queue selection for mesh/OCB interfaces
BugLink: https://bugs.launchpad.net/bugs/1988219 commit 50e2ab3 upstream. 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: [email protected] Signed-off-by: Felix Fietkau <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent c947c3c commit 7349d13

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/mac80211/wme.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ u16 __ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
145145
bool qos;
146146

147147
/* all mesh/ocb stations are required to support WME */
148-
if (sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
149-
sdata->vif.type == NL80211_IFTYPE_OCB)
148+
if (sta && (sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
149+
sdata->vif.type == NL80211_IFTYPE_OCB))
150150
qos = true;
151151
else if (sta)
152152
qos = sta->sta.wme;

0 commit comments

Comments
 (0)