From: Nogah Frankel <nog...@mellanox.com>

When a mrouter is registered or leaves a mid, don't update the HW.

Signed-off-by: Nogah Frankel <nog...@mellanox.com>
Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c 
b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 459cedc..0f9eac5 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -1491,6 +1491,9 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port 
*mlxsw_sp_port,
        if (!bridge_device->multicast_enabled)
                return 0;
 
+       if (bridge_port->mrouter)
+               return 0;
+
        err = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true);
        if (err) {
                netdev_err(dev, "Unable to set SMID\n");
@@ -1613,10 +1616,12 @@ __mlxsw_sp_port_mdb_del(struct mlxsw_sp_port 
*mlxsw_sp_port,
        int err;
 
        if (bridge_port->bridge_device->multicast_enabled) {
-               err = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, false);
-
-               if (err)
-                       netdev_err(dev, "Unable to remove port from SMID\n");
+               if (bridge_port->bridge_device->multicast_enabled) {
+                       err = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid,
+                                                    false);
+                       if (err)
+                               netdev_err(dev, "Unable to remove port from 
SMID\n");
+               }
        }
 
        err = mlxsw_sp_port_remove_from_mid(mlxsw_sp_port, mid);
-- 
2.9.5

Reply via email to