diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2017-09-25 10:58:20 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-09-26 20:26:45 -0700 |
| commit | 2a52a8c6e594cdc562f503492ba89ac7bc0c4074 (patch) | |
| tree | 304ed37a408b3509636f804ade321d32a7da3b80 /drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | |
| parent | Merge branch 'net-dsa-use-generic-slave-phydev' (diff) | |
| download | linux-dev-2a52a8c6e594cdc562f503492ba89ac7bc0c4074.tar.xz linux-dev-2a52a8c6e594cdc562f503492ba89ac7bc0c4074.zip | |
mlxsw: spectrum_acl: Propagate errors from mlxsw_afa_block_jump/continue
Propagate error instead of doing WARN_ON right away.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 50b40de1fb91..7e8284b46968 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -608,7 +608,10 @@ mlxsw_sp_acl_tcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp, goto err_rulei_create; } - mlxsw_sp_acl_rulei_act_continue(rulei); + err = mlxsw_sp_acl_rulei_act_continue(rulei); + if (WARN_ON(err)) + goto err_rulei_act_continue; + err = mlxsw_sp_acl_rulei_commit(rulei); if (err) goto err_rulei_commit; @@ -623,6 +626,7 @@ mlxsw_sp_acl_tcam_region_catchall_add(struct mlxsw_sp *mlxsw_sp, err_rule_insert: err_rulei_commit: +err_rulei_act_continue: mlxsw_sp_acl_rulei_destroy(rulei); err_rulei_create: parman_item_remove(region->parman, parman_prio, parman_item); |