Commit 1ba373d9 authored by Tariq Toukan's avatar Tariq Toukan Committed by Liu Jian
Browse files

net/mlx5e: Add wrapping for auxiliary_driver ops and remove unused args 

mainline inclusion
from mainline-v6.8-rc1
commit b1a33e65134786b9ef97f978572531c6004c8526
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA6S7G
CVE: CVE-2024-38608

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b1a33e65134786b9ef97f978572531c6004c8526



---------------------------

Turn some of the struct auxiliary_driver ops into wrappers to stop
having dummy local vars passed as unused arguments.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent 30113d28

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

+15 −7
Original line number Diff line number Diff line
@@ -6006,7 +6006,7 @@ static int mlx5e_resume(struct auxiliary_device *adev) 
	return 0;

}



static int mlx5e_suspend(struct auxiliary_device *adev, pm_message_t state)

static int _mlx5e_suspend(struct auxiliary_device *adev)

{

	struct mlx5e_dev *mlx5e_dev = auxiliary_get_drvdata(adev);

	struct mlx5e_priv *priv = mlx5e_dev->priv;
@@ -6024,15 +6024,18 @@ static int mlx5e_suspend(struct auxiliary_device *adev, pm_message_t state) 
	return 0;

}



static int mlx5e_probe(struct auxiliary_device *adev,

		       const struct auxiliary_device_id *id)

static int mlx5e_suspend(struct auxiliary_device *adev, pm_message_t state)

{

	return _mlx5e_suspend(adev);

}



static int _mlx5e_probe(struct auxiliary_device *adev)

{

	struct mlx5_adev *edev = container_of(adev, struct mlx5_adev, adev);

	const struct mlx5e_profile *profile = &mlx5e_nic_profile;

	struct mlx5_core_dev *mdev = edev->mdev;

	struct mlx5e_dev *mlx5e_dev;

	struct net_device *netdev;

	pm_message_t state = {};

	struct mlx5e_priv *priv;

	int err;
@@ -6087,7 +6090,7 @@ static int mlx5e_probe(struct auxiliary_device *adev, 
	return 0;



err_resume:

	mlx5e_suspend(adev, state);

	_mlx5e_suspend(adev);

err_profile_cleanup:

	profile->cleanup(priv);

err_destroy_netdev:
@@ -6099,16 +6102,21 @@ static int mlx5e_probe(struct auxiliary_device *adev, 
	return err;

}



static int mlx5e_probe(struct auxiliary_device *adev,

		       const struct auxiliary_device_id *id)

{

	return _mlx5e_probe(adev);

}



static void mlx5e_remove(struct auxiliary_device *adev)

{

	struct mlx5e_dev *mlx5e_dev = auxiliary_get_drvdata(adev);

	struct mlx5e_priv *priv = mlx5e_dev->priv;

	pm_message_t state = {};



	mlx5_core_uplink_netdev_set(priv->mdev, NULL);

	mlx5e_dcbnl_delete_app(priv);

	unregister_netdev(priv->netdev);

	mlx5e_suspend(adev, state);

	_mlx5e_suspend(adev);

	priv->profile->cleanup(priv);

	mlx5e_destroy_netdev(priv);

	mlx5e_devlink_port_unregister(mlx5e_dev);