Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46ff2bc7 authored by Eli Cohen's avatar Eli Cohen Committed by Greg Kroah-Hartman
Browse files

net/mlx5: Fix required capability for manipulating MPFS 



[ Upstream commit f811980444ec59ad62f9e041adbb576a821132c7 ]

Manipulating of the MPFS requires eswitch manager capabilities.

Fixes: eeb66cdb ('net/mlx5: Separate between E-Switch and MPFS')
Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b7b5f76

drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c

+5 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/mlx5_ifc.h>

#include "mlx5_core.h"

#include "eswitch.h"

#include "lib/mpfs.h"



/* HW L2 Table (MPFS) management */
@@ -98,7 +99,7 @@ int mlx5_mpfs_init(struct mlx5_core_dev *dev) 
	int l2table_size = 1 << MLX5_CAP_GEN(dev, log_max_l2_table);

	struct mlx5_mpfs *mpfs;



	if (!MLX5_VPORT_MANAGER(dev))

	if (!MLX5_ESWITCH_MANAGER(dev))

		return 0;



	mpfs = kzalloc(sizeof(*mpfs), GFP_KERNEL);
@@ -122,7 +123,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev) 
{

	struct mlx5_mpfs *mpfs = dev->priv.mpfs;



	if (!MLX5_VPORT_MANAGER(dev))

	if (!MLX5_ESWITCH_MANAGER(dev))

		return;



	WARN_ON(!hlist_empty(mpfs->hash));
@@ -137,7 +138,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac) 
	u32 index;

	int err;



	if (!MLX5_VPORT_MANAGER(dev))

	if (!MLX5_ESWITCH_MANAGER(dev))

		return 0;



	mutex_lock(&mpfs->lock);
@@ -179,7 +180,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac) 
	int err = 0;

	u32 index;



	if (!MLX5_VPORT_MANAGER(dev))

	if (!MLX5_ESWITCH_MANAGER(dev))

		return 0;



	mutex_lock(&mpfs->lock);