tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Paolo Abeni <pabeni@redhat.com>

Paolo Abeni eb1e937e ce052b94

+9 -3
-1
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
··· 6825 6825 * is already unregistered before changing to NIC profile. 6826 6826 */ 6827 6827 if (priv->netdev->reg_state == NETREG_REGISTERED) { 6828 - mlx5e_psp_unregister(priv); 6829 6828 unregister_netdev(priv->netdev); 6830 6829 _mlx5e_suspend(adev, false); 6831 6830 } else {
+9 -2
drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
··· 67 67 68 68 static int enable_mpesw(struct mlx5_lag *ldev) 69 69 { 70 - int idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1); 71 70 struct mlx5_core_dev *dev0; 72 71 int err; 72 + int idx; 73 73 int i; 74 74 75 - if (idx < 0 || ldev->mode != MLX5_LAG_MODE_NONE) 75 + if (ldev->mode == MLX5_LAG_MODE_MPESW) 76 + return 0; 77 + 78 + if (ldev->mode != MLX5_LAG_MODE_NONE) 79 + return -EINVAL; 80 + 81 + idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1); 82 + if (idx < 0) 76 83 return -EINVAL; 77 84 78 85 dev0 = ldev->pf[idx].dev;