package/kernel/mac80211/patches/subsys/308-v6.2-wifi-mac80211-fix-MLO-AP_VLAN-check.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Wed, 14 Dec 2022 13:46:38 +0100
   3 Subject: [PATCH] wifi: mac80211: fix MLO + AP_VLAN check
   4
   5 Instead of preventing adding AP_VLAN to MLO enabled APs, this check was
   6 preventing adding more than one 4-addr AP_VLAN regardless of the MLO status.
   7 Fix this by adding missing extra checks.
   8
   9 Fixes: ae960ee90bb1 ("wifi: mac80211: prevent VLANs on MLDs")
  10 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  11 ---
  12
  13 --- a/net/mac80211/iface.c
  14 +++ b/net/mac80211/iface.c
  15 @@ -364,7 +364,9 @@ static int ieee80211_check_concurrent_if
  16
  17                         /* No support for VLAN with MLO yet */
  18                         if (iftype == NL80211_IFTYPE_AP_VLAN &&
  19 -                           nsdata->wdev.use_4addr)
  20 +                           sdata->wdev.use_4addr &&
  21 +                           nsdata->vif.type == NL80211_IFTYPE_AP &&
  22 +                           nsdata->vif.valid_links)
  23                                 return -EOPNOTSUPP;
  24
  25                         /*