Skip to content

Commit eb1e937

Browse files
author
Paolo Abeni
committed
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>
2 parents ce052b9 + 35e9373 commit eb1e937

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6825,7 +6825,6 @@ static void _mlx5e_remove(struct auxiliary_device *adev)
68256825
* is already unregistered before changing to NIC profile.
68266826
*/
68276827
if (priv->netdev->reg_state == NETREG_REGISTERED) {
6828-
mlx5e_psp_unregister(priv);
68296828
unregister_netdev(priv->netdev);
68306829
_mlx5e_suspend(adev, false);
68316830
} else {

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,19 @@ static int mlx5_mpesw_metadata_set(struct mlx5_lag *ldev)
6767

6868
static int enable_mpesw(struct mlx5_lag *ldev)
6969
{
70-
int idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1);
7170
struct mlx5_core_dev *dev0;
7271
int err;
72+
int idx;
7373
int i;
7474

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)
7683
return -EINVAL;
7784

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

0 commit comments

Comments
 (0)