mac80211: mark patches accepted upstream

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / subsys / 308-wifi-mac80211-fix-MLO-AP_VLAN-check.patch

diff --git a/package/kernel/mac80211/patches/subsys/308-wifi-mac80211-fix-MLO-AP_VLAN-check.patch b/package/kernel/mac80211/patches/subsys/308-wifi-mac80211-fix-MLO-AP_VLAN-check.patch
deleted file mode 100644 (file)
index 2d181e3..0000000
--- a/package/kernel/mac80211/patches/subsys/308-wifi-mac80211-fix-MLO-AP_VLAN-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Wed, 14 Dec 2022 13:46:38 +0100
-Subject: [PATCH] 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>
----
-
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -364,7 +364,9 @@ static int ieee80211_check_concurrent_if
- 
-                       /* 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;
- 
-                       /*