Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94413175 authored by Gavi Teitz's avatar Gavi Teitz Committed by Greg Kroah-Hartman
Browse files

net/mlx5e: Fix error handling when refreshing TIRs 



[ Upstream commit bc87a0036826a37b43489b029af8143bd07c6cca ]

Previously, a false positive would be caught if the TIRs list is
empty, since the err value was initialized to -ENOMEM, and was only
updated if a TIR is refreshed. This is resolved by initializing the
err value to zero.

Fixes: b676f653 ("net/mlx5e: Refactor refresh TIRs")
Signed-off-by: default avatarGavi Teitz <gavi@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0516ef27

drivers/net/ethernet/mellanox/mlx5/core/en_common.c

+4 −2
Original line number Diff line number Diff line
@@ -141,15 +141,17 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb) 
{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5e_tir *tir;

	int err  = -ENOMEM;

	int err  = 0;

	u32 tirn = 0;

	int inlen;

	void *in;



	inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

	if (!in) {

		err = -ENOMEM;

		goto out;

	}



	if (enable_uc_lb)

		MLX5_SET(modify_tir_in, in, ctx.self_lb_block,