diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2019-03-31 06:49:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-31 11:01:23 -0700 |
| commit | 44fd86cb7e6d01f32a0db1e6ba25272dcf5dc9f4 (patch) | |
| tree | 0cdfdcb71f79be0e601f6fde89a1c9dd3bf15c5b | |
| parent | 35f861e3c58e128f0ecb5669c43159285ea5254a (diff) | |
| download | talos-op-linux-44fd86cb7e6d01f32a0db1e6ba25272dcf5dc9f4.tar.gz talos-op-linux-44fd86cb7e6d01f32a0db1e6ba25272dcf5dc9f4.zip | |
mlxsw: spectrum_acl: Remove redundant failed_rollback from migrate_start()
The flag is set by the caller mlxsw_sp_acl_tcam_vregion_migrate() anyway,
so don't set it here.
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>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 8811f6513e36..a26854f97f0f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -1256,11 +1256,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_start(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam_chunk *new_chunk; new_chunk = mlxsw_sp_acl_tcam_chunk_create(mlxsw_sp, vchunk, region); - if (IS_ERR(new_chunk)) { - if (ctx->this_is_rollback) - vchunk->vregion->failed_rollback = true; + if (IS_ERR(new_chunk)) return PTR_ERR(new_chunk); - } vchunk->chunk2 = vchunk->chunk; vchunk->chunk = new_chunk; ctx->current_vchunk = vchunk; |
