dpaa2-switch: move a check to the prechangeupper stage

Two different DPAA2 switch ports from two different DPSW instances
cannot be under the same bridge. Instead of checking for this
unsupported configuration in the CHANGEUPPER event, check it as early as
possible in the PRECHANGEUPPER one.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
index a9a76d640bc8b2907595ddc9903e535a68fcecb4..bccdaaaf5ea16660d21ed7021ecc7d53e29d14f8 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
@@ -2005,24 +2005,9 @@ static int dpaa2_switch_port_bridge_join(struct net_device *netdev,
 {
        struct ethsw_port_priv *port_priv = netdev_priv(netdev);
        struct ethsw_core *ethsw = port_priv->ethsw_data;
-       struct ethsw_port_priv *other_port_priv;
-       struct net_device *other_dev;
-       struct list_head *iter;
        bool learn_ena;
        int err;
 
-       netdev_for_each_lower_dev(upper_dev, other_dev, iter) {
-               if (!dpaa2_switch_port_dev_check(other_dev))
-                       continue;
-
-               other_port_priv = netdev_priv(other_dev);
-               if (other_port_priv->ethsw_data != port_priv->ethsw_data) {
-                       NL_SET_ERR_MSG_MOD(extack,
-                                          "Interface from a different DPSW is in the bridge already");
-                       return -EINVAL;
-               }
-       }
-
        /* Delete the previously manually installed VLAN 1 */
        err = dpaa2_switch_port_del_vlan(port_priv, 1);
        if (err)
@@ -2156,6 +2141,10 @@ dpaa2_switch_prechangeupper_sanity_checks(struct net_device *netdev,
                                          struct net_device *upper_dev,
                                          struct netlink_ext_ack *extack)
 {
+       struct ethsw_port_priv *port_priv = netdev_priv(netdev);
+       struct ethsw_port_priv *other_port_priv;
+       struct net_device *other_dev;
+       struct list_head *iter;
        int err;
 
        if (!br_vlan_enabled(upper_dev)) {
@@ -2170,6 +2159,18 @@ dpaa2_switch_prechangeupper_sanity_checks(struct net_device *netdev,
                return 0;
        }
 
+       netdev_for_each_lower_dev(upper_dev, other_dev, iter) {
+               if (!dpaa2_switch_port_dev_check(other_dev))
+                       continue;
+
+               other_port_priv = netdev_priv(other_dev);
+               if (other_port_priv->ethsw_data != port_priv->ethsw_data) {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Interface from a different DPSW is in the bridge already");
+                       return -EINVAL;
+               }
+       }
+
        return 0;
 }