Commit de411a82 authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed
Browse files

net/mlx5e: Create auxdev devlink instance in the same ns as parent devlink 



Commit cited in "fixes" tag moved the devlink port under separate
devlink entity created for auxiliary device. Respect the network
namespace of parent devlink entity and allocate the devlink there.

Fixes: ee75f1fc ("net/mlx5e: Create separate devlink instance for ethernet auxiliary device")
Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 6d6e71e6

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

+4 −2
Original line number Diff line number Diff line
@@ -7,12 +7,14 @@ 
static const struct devlink_ops mlx5e_devlink_ops = {

};



struct mlx5e_dev *mlx5e_create_devlink(struct device *dev)

struct mlx5e_dev *mlx5e_create_devlink(struct device *dev,

				       struct mlx5_core_dev *mdev)

{

	struct mlx5e_dev *mlx5e_dev;

	struct devlink *devlink;



	devlink = devlink_alloc(&mlx5e_devlink_ops, sizeof(*mlx5e_dev), dev);

	devlink = devlink_alloc_ns(&mlx5e_devlink_ops, sizeof(*mlx5e_dev),

				   devlink_net(priv_to_devlink(mdev)), dev);

	if (!devlink)

		return ERR_PTR(-ENOMEM);

	devlink_register(devlink);

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
#include <net/devlink.h>

#include "en.h"



struct mlx5e_dev *mlx5e_create_devlink(struct device *dev);

struct mlx5e_dev *mlx5e_create_devlink(struct device *dev,

				       struct mlx5_core_dev *mdev);

void mlx5e_destroy_devlink(struct mlx5e_dev *mlx5e_dev);

int mlx5e_devlink_port_register(struct mlx5e_dev *mlx5e_dev,

				struct mlx5_core_dev *mdev);

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

+1 −1
Original line number Diff line number Diff line
@@ -5898,7 +5898,7 @@ static int mlx5e_probe(struct auxiliary_device *adev, 
	struct mlx5e_priv *priv;

	int err;



	mlx5e_dev = mlx5e_create_devlink(&adev->dev);

	mlx5e_dev = mlx5e_create_devlink(&adev->dev, mdev);

	if (IS_ERR(mlx5e_dev))

		return PTR_ERR(mlx5e_dev);

	auxiliary_set_drvdata(adev, mlx5e_dev);