diff mbox series

[27/27] wifi: mac80211: prevent VLANs on MLDs

Message ID	20220902161144.8c88531146e9.If2ef9a3b138d4f16ed2fda91c852da156bdf5e4d@changeid (mailing list archive)
State	Accepted
Delegated to:	Johannes Berg
Headers	show Return-Path: <linux-wireless-owner@kernel.org> From: Johannes Berg <johannes@sipsolutions.net> To: linux-wireless@vger.kernel.org Cc: Johannes Berg <johannes.berg@intel.com> Subject: [PATCH 27/27] wifi: mac80211: prevent VLANs on MLDs Date: Fri, 2 Sep 2022 16:12:59 +0200 Message-Id: <20220902161144.8c88531146e9.If2ef9a3b138d4f16ed2fda91c852da156bdf5e4d@changeid> In-Reply-To: <20220902141259.377789-1-johannes@sipsolutions.net> References: <20220902141259.377789-1-johannes@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	another set of MLO patches \| expand [00/27] another set of MLO patches [01/27] wifi: mac80211_hwsim: remove multicast workaround [02/27] wifi: mac80211: remove unused arg to ieee80211_chandef_eht_oper [03/27] wifi: mac80211_hwsim: check STA magic in change_sta_links [04/27] wifi: mac80211_hwsim: refactor RX a bit [05/27] wifi: mac80211: move link code to a new file [06/27] wifi: mac80211: mlme: assign link address correctly [07/27] wifi: mac80211_hwsim: warn on invalid link address [08/27] wifi: mac80211: use correct rx link_sta instead of default [09/27] wifi: mac80211: make smps_mode per-link [10/27] wifi: mac80211: isolate driver from inactive links [11/27] wifi: mac80211: add ieee80211_find_sta_by_link_addrs API [12/27] wifi: mac80211_hwsim: skip inactive links on TX [13/27] wifi: mac80211_hwsim: track active STA links [14/27] wifi: mac80211: mlme: refactor QoS settings code [15/27] wifi: mac80211: extend ieee80211_nullfunc_get() for MLO [16/27] wifi: mac80211_hwsim: send NDP for link (de)activation [17/27] wifi: mac80211_hwsim: fix multi-channel handling in netlink RX [18/27] wifi: nl80211: add MLD address to assoc BSS entries [19/27] wifi: mac80211: call drv_sta_state() under sdata_lock() in reconfig [20/27] wifi: mac80211: add vif/sta link RCU dereference macros [21/27] wifi: mac80211: set up beacon timing config on links [22/27] wifi: mac80211: keep A-MSDU data in sta and per-link [23/27] wifi: mac80211: fix double SW scan stop [24/27] wifi: mac80211: implement link switching [25/27] wifi: mac80211_hwsim: always activate all links [26/27] wifi: mac80211: prevent 4-addr use on MLDs [27/27] wifi: mac80211: prevent VLANs on MLDs

Commit Message

Johannes Berg Sept. 2, 2022, 2:12 p.m. UTC

From: Johannes Berg <johannes.berg@intel.com>

Do not allow VLANs to be added to AP interfaces that are
MLDs, this isn't going to work because the link structs
aren't propagated to the VLAN interfaces yet.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/mac80211/iface.c | 5 +++++
 1 file changed, 5 insertions(+)

diff mbox series

Patch

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 30c62b63d179..3ea1f4fbca7b 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -296,6 +296,11 @@  static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
 							nsdata->vif.type))
 				return -ENOTUNIQ;
 
+			/* No support for VLAN with MLO yet */
+			if (iftype == NL80211_IFTYPE_AP_VLAN &&
+			    nsdata->wdev.use_4addr)
+				return -EOPNOTSUPP;
+
 			/*
 			 * can only add VLANs to enabled APs
 			 */