From: Amit Cohen <amcohen@nvidia.com>
Date: Tue, 21 Jun 2022 08:33:35 +0000 (+0300)
Subject: mlxsw: spectrum_switchdev: Do not set 'multicast_enabled' twice
X-Git-Tag: block-6.0-2022-08-12~31^2~315^2~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6e66d2e4b3a20655262569ec394f79a2eee87028;p=linux-block.git

mlxsw: spectrum_switchdev: Do not set 'multicast_enabled' twice

The function mlxsw_sp_port_mc_disabled_set() sets
'bridge_device->multicast_enabled' twice. Remove the unnecessary setting.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 099ecb594d03..85757d79cb27 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -870,8 +870,6 @@ static int mlxsw_sp_port_mc_disabled_set(struct mlxsw_sp_port *mlxsw_sp_port,
 			return err;
 	}
 
-	bridge_device->multicast_enabled = !mc_disabled;
-
 	return 0;
 }