Commit eb1e937e authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'mlx5-misc-fixes-2025-12-01' 

Tariq Toukan says:

====================
mlx5 misc fixes 2025-12-01

This small patchset provides misc bug fixes from the team to the mlx5
core and Eth drivers.
====================

Link: https://patch.msgid.link/1764602008-1334866-1-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents ce052b94 35e93736

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

+0 −1
Original line number Diff line number Diff line
@@ -6825,7 +6825,6 @@ static void _mlx5e_remove(struct auxiliary_device *adev) 
	 * is already unregistered before changing to NIC profile.

	 */

	if (priv->netdev->reg_state == NETREG_REGISTERED) {

		mlx5e_psp_unregister(priv);

		unregister_netdev(priv->netdev);

		_mlx5e_suspend(adev, false);

	} else {

drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c

+9 −2
Original line number Diff line number Diff line
@@ -67,12 +67,19 @@ static int mlx5_mpesw_metadata_set(struct mlx5_lag *ldev) 


static int enable_mpesw(struct mlx5_lag *ldev)

{

	int idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1);

	struct mlx5_core_dev *dev0;

	int err;

	int idx;

	int i;



	if (idx < 0 || ldev->mode != MLX5_LAG_MODE_NONE)

	if (ldev->mode == MLX5_LAG_MODE_MPESW)

		return 0;



	if (ldev->mode != MLX5_LAG_MODE_NONE)

		return -EINVAL;



	idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1);

	if (idx < 0)

		return -EINVAL;



	dev0 = ldev->pf[idx].dev;