Commit da689d5e authored Jan 08, 2019 by Jiri Pirko Committed by Greg Kroah-Hartman Jan 26, 2019

mlxsw: spectrum: Disable lag port TX before removing it



[ Upstream commit 8adbe212a159d9c78a90fca1d854f6e63452426b ]

Make sure that lag port TX is disabled before mlxsw_sp_port_lag_leave()
is called and prevent from possible EMAD error.

Fixes: 0d65fc13 ("mlxsw: spectrum: Implement LAG port join/leave")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a2fc92be

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -4276,12 +4276,15 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,
		lower_dev,
		upper_dev);
		} else if (netif_is_lag_master(upper_dev)) {
		if (info->linking)
		if (info->linking) {
		err = mlxsw_sp_port_lag_join(mlxsw_sp_port,
		upper_dev);
		else
		} else {
		mlxsw_sp_port_lag_tx_en_set(mlxsw_sp_port,
		false);
		mlxsw_sp_port_lag_leave(mlxsw_sp_port,
		upper_dev);
		}
		} else if (netif_is_ovs_master(upper_dev)) {
		if (info->linking)
		err = mlxsw_sp_port_ovs_join(mlxsw_sp_port);