Skip to content

Commit f216033

Browse files
nbd168jmberg-intel
authored andcommitted
wifi: mac80211: fix MLO + AP_VLAN check
Instead of preventing adding AP_VLAN to MLO enabled APs, this check was preventing adding more than one 4-addr AP_VLAN regardless of the MLO status. Fix this by adding missing extra checks. Fixes: ae960ee ("wifi: mac80211: prevent VLANs on MLDs") Signed-off-by: Felix Fietkau <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: [email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent fa22b51 commit f216033

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/mac80211/iface.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,9 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
364364

365365
/* No support for VLAN with MLO yet */
366366
if (iftype == NL80211_IFTYPE_AP_VLAN &&
367-
nsdata->wdev.use_4addr)
367+
sdata->wdev.use_4addr &&
368+
nsdata->vif.type == NL80211_IFTYPE_AP &&
369+
nsdata->vif.valid_links)
368370
return -EOPNOTSUPP;
369371

370372
/*

0 commit comments

Comments
 (0)