diff options
| author |   Ido Schimmel <idosch@mellanox.com> | 2016-05-06 22:18:39 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-06 18:27:42 -0400 |
| commit | 51554db2d23f71989e040df838613bbae554d4e0 (patch) | |
| tree | db502cb1e6ea82e641470089c903ba560bb9f60f /drivers/net/ethernet/mellanox | |
| parent | udp_offload: Set encapsulation before inner completes. (diff) | |
| download | linux-dev-51554db2d23f71989e040df838613bbae554d4e0.tar.xz linux-dev-51554db2d23f71989e040df838613bbae554d4e0.zip | |
mlxsw: spectrum: Fix rollback order in LAG join failure
Make the leave procedure in the error path symmetric to the join
procedure and first remove the port from the collector before
potentially destroying the LAG.
Fixes: 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 4afbc3e9e381..668b2f465ca5 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2541,11 +2541,11 @@ static int mlxsw_sp_port_lag_join(struct mlxsw_sp_port *mlxsw_sp_port, lag->ref_count++; return 0; +err_col_port_enable: + mlxsw_sp_lag_col_port_remove(mlxsw_sp_port, lag_id); err_col_port_add: if (!lag->ref_count) mlxsw_sp_lag_destroy(mlxsw_sp, lag_id); -err_col_port_enable: - mlxsw_sp_lag_col_port_remove(mlxsw_sp_port, lag_id); return err; } |