diff options
| author | Felix Fietkau <nbd@nbd.name> | 2022-12-14 14:03:26 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-01-10 13:24:30 +0100 |
| commit | f216033d770f7ca0eda491fe01a9f02e7af59576 (patch) | |
| tree | 0b56de4d923959a3d87e528a45f421eea2bd5676 /net/mac80211 | |
| parent | fa22b51ace8aa106267636f36170e940e676809c (diff) | |
| download | linux-f216033d770f7ca0eda491fe01a9f02e7af59576.tar.bz2 | |
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: ae960ee90bb1 ("wifi: mac80211: prevent VLANs on MLDs")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20221214130326.37756-1-nbd@nbd.name
Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index d49a5906a943..e20c3fe9a0b1 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -364,7 +364,9 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata, /* No support for VLAN with MLO yet */ if (iftype == NL80211_IFTYPE_AP_VLAN && - nsdata->wdev.use_4addr) + sdata->wdev.use_4addr && + nsdata->vif.type == NL80211_IFTYPE_AP && + nsdata->vif.valid_links) return -EOPNOTSUPP; /* |