2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
index ea56f6ade6b4..5f0a7bc692a4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -199,10 +199,11 @@ static int mlxsw_sp_erif_entry_get(struct mlxsw_sp *mlxsw_sp,
 
         entry->counter_valid = false;
         entry->counter = 0;
+        entry->index = mlxsw_sp_rif_index(rif);
+
         if (!counters_enabled)
                 return 0;
 
-        entry->index = mlxsw_sp_rif_index(rif);
         err = mlxsw_sp_rif_counter_value_get(mlxsw_sp, rif,
                                              MLXSW_SP_RIF_COUNTER_EGRESS,
                                              &cnt);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 33cec1cc1642..9f89c4137d21 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -206,6 +206,9 @@ void mlxsw_sp_rif_counter_free(struct mlxsw_sp *mlxsw_sp,
 {
         unsigned int *p_counter_index;
 
+        if (!mlxsw_sp_rif_counter_valid_get(rif, dir))
+                return;
+
         p_counter_index = mlxsw_sp_rif_p_counter_get(rif, dir);
         if (WARN_ON(!p_counter_index))
                 return;