From 4711671297ecfe5a5e9976f449c6161133f5ebb1 Mon Sep 17 00:00:00 2001 From: Amit Cohen Date: Thu, 6 Jan 2022 18:06:47 +0200 Subject: [PATCH] mlxsw: spectrum_acl_bloom_filter: Reorder functions to make the code more aesthetic Currently, mlxsw_sp_acl_bf_rule_count_index_get() is implemented before mlxsw_sp_acl_bf_index_get() but is used after it. Adding a new function for Spectrum-4 would make them further apart still. Fix by moving them around. Signed-off-by: Amit Cohen Reviewed-by: Petr Machata Signed-off-by: Ido Schimmel Signed-off-by: Jakub Kicinski --- .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c index dbd3bebf11ec..732c261f83cf 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c @@ -142,14 +142,6 @@ mlxsw_sp_acl_bf_key_encode(struct mlxsw_sp_acl_atcam_region *aregion, *len = chunk_count * MLXSW_BLOOM_KEY_CHUNK_BYTES; } -static unsigned int -mlxsw_sp_acl_bf_rule_count_index_get(struct mlxsw_sp_acl_bf *bf, - unsigned int erp_bank, - unsigned int bf_index) -{ - return erp_bank * bf->bank_size + bf_index; -} - static unsigned int mlxsw_sp_acl_bf_index_get(struct mlxsw_sp_acl_bf *bf, struct mlxsw_sp_acl_atcam_region *aregion, @@ -162,6 +154,14 @@ mlxsw_sp_acl_bf_index_get(struct mlxsw_sp_acl_bf *bf, return mlxsw_sp_acl_bf_crc(bf_key, bf_size); } +static unsigned int +mlxsw_sp_acl_bf_rule_count_index_get(struct mlxsw_sp_acl_bf *bf, + unsigned int erp_bank, + unsigned int bf_index) +{ + return erp_bank * bf->bank_size + bf_index; +} + int mlxsw_sp_acl_bf_entry_add(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_bf *bf,