diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2018-11-14 08:22:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-15 14:43:43 -0800 |
| commit | 59600844cf4ef6acf65166ef6e47e89f7a79717c (patch) | |
| tree | a908e907d9ba99d84dbc076b1d4a5a7dae98f57d /drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | |
| parent | b1ce60e6214d93fbeffa39e6f9db21c0a4591b1e (diff) | |
| download | linux-stable-59600844cf4ef6acf65166ef6e47e89f7a79717c.tar.gz linux-stable-59600844cf4ef6acf65166ef6e47e89f7a79717c.tar.bz2 linux-stable-59600844cf4ef6acf65166ef6e47e89f7a79717c.zip | |
mlxsw: spectrum: acl: Remove mlxsw_afk_encode() block range args and key/mask check
Since two remaining users of mlxsw_afk_encode() do not specify
block ranges to work on, remove the args. Also, key/mask is always
non-NULL now, so skip the checks.
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>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c index ffdf464660be..12798ce33a60 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c @@ -439,12 +439,10 @@ __mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp, char mask[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN] = { 0 }; struct mlxsw_afk *afk = mlxsw_sp_acl_afk(mlxsw_sp->acl); struct mlxsw_sp_acl_erp_mask *erp_mask; - unsigned int blocks_count; int err; - blocks_count = mlxsw_afk_key_info_blocks_count_get(region->key_info); mlxsw_afk_encode(afk, region->key_info, &rulei->values, - aentry->ht_key.enc_key, mask, 0, blocks_count - 1); + aentry->ht_key.enc_key, mask); erp_mask = mlxsw_sp_acl_erp_mask_get(aregion, mask, false); if (IS_ERR(erp_mask)) |