aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2019-02-28 06:59:22 +0000
committerDavid S. Miller <davem@davemloft.net>2019-03-01 21:44:11 -0800
commit2c331593c99e0c9bf9bb27b8afa92d96d4decac8 (patch)
treedde179281550e9896ec91b2bb39b338eb58e7ed7 /drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
parentmlxsw: spectrum_acl: assign vchunk->chunk by the newly created chunk (diff)
downloadlinux-dev-2c331593c99e0c9bf9bb27b8afa92d96d4decac8.tar.xz
linux-dev-2c331593c99e0c9bf9bb27b8afa92d96d4decac8.zip
mlxsw: spectrum_acl: Rename variables in mlxsw_sp_acl_tcam_ventry_migrate()
Remove some of variables in function mlxsw_sp_acl_tcam_ventry_migrate() so the names are aligned with the rest of the code. 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 '')
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
index 6a50266b6809..0bc04016c6d0 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -1175,19 +1175,19 @@ mlxsw_sp_acl_tcam_ventry_activity_get(struct mlxsw_sp *mlxsw_sp,
static int
mlxsw_sp_acl_tcam_ventry_migrate(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_acl_tcam_ventry *ventry,
- struct mlxsw_sp_acl_tcam_chunk *chunk2)
+ struct mlxsw_sp_acl_tcam_chunk *chunk)
{
- struct mlxsw_sp_acl_tcam_entry *entry2;
+ struct mlxsw_sp_acl_tcam_entry *new_entry;
/* First check if the entry is not already where we want it to be. */
- if (ventry->entry->chunk == chunk2)
+ if (ventry->entry->chunk == chunk)
return 0;
- entry2 = mlxsw_sp_acl_tcam_entry_create(mlxsw_sp, ventry, chunk2);
- if (IS_ERR(entry2))
- return PTR_ERR(entry2);
+ new_entry = mlxsw_sp_acl_tcam_entry_create(mlxsw_sp, ventry, chunk);
+ if (IS_ERR(new_entry))
+ return PTR_ERR(new_entry);
mlxsw_sp_acl_tcam_entry_destroy(mlxsw_sp, ventry->entry);
- ventry->entry = entry2;
+ ventry->entry = new_entry;
return 0;
}