mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
dpaa2-switch: do not accept VLAN uppers while bridged
The dpaa2-switch driver does not support VLAN uppers while its ports are
bridged. This scenario tried to be prevented by rejecting a bridge join
while VLAN uppers exist but the reverse order was still possible.
This patches adds a check so that the dpaa2-switch also does not accept
VLAN uppers while bridged.
Fixes: f48298d3fb ("staging: dpaa2-switch: move the driver out of staging")
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Link: https://patch.msgid.link/20260618092813.432535-2-ioana.ciornei@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
9ed19e11d2
commit
d07d80b6a1
|
|
@ -2233,6 +2233,7 @@ dpaa2_switch_prechangeupper_sanity_checks(struct net_device *netdev,
|
|||
static int dpaa2_switch_port_prechangeupper(struct net_device *netdev,
|
||||
struct netdev_notifier_changeupper_info *info)
|
||||
{
|
||||
struct ethsw_port_priv *port_priv;
|
||||
struct netlink_ext_ack *extack;
|
||||
struct net_device *upper_dev;
|
||||
int err;
|
||||
|
|
@ -2251,6 +2252,13 @@ static int dpaa2_switch_port_prechangeupper(struct net_device *netdev,
|
|||
|
||||
if (!info->linking)
|
||||
dpaa2_switch_port_pre_bridge_leave(netdev);
|
||||
} else if (is_vlan_dev(upper_dev)) {
|
||||
port_priv = netdev_priv(netdev);
|
||||
if (port_priv->fdb->bridge_dev) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Cannot accept VLAN uppers while bridged");
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user