From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 16 Sep 2021 20:58:38 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=561bed688bffedd6bbdfa70af7a4f64f0a3e2140;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

No conflicts!

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

561bed688bffedd6bbdfa70af7a4f64f0a3e2140
diff --cc drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index dde8c03c5cfe7,dcf9f27ba2efd..7d56a927081d0
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@@ -676,11 -678,10 +675,9 @@@ static int mlx5_devlink_rdma_param_regi
  
  static void mlx5_devlink_rdma_param_unregister(struct devlink *devlink)
  {
- 	struct mlx5_core_dev *dev = devlink_priv(devlink);
- 
- 	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND) || MLX5_ESWITCH_MANAGER(dev))
+ 	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))
  		return;
  
 -	devlink_param_unpublish(devlink, &enable_rdma_param);
  	devlink_param_unregister(devlink, &enable_rdma_param);
  }