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: f48298d3fbfa ("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>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
index 9f75cd66ae38a13ea037c6f5e95e3d8bb633a847..858ba844ac516487efe9add18669268977fbefe9 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
@@ -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;