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

Commit bf3e4d38 authored by Bodong Wang's avatar Bodong Wang Committed by Saeed Mahameed
Browse files

net/mlx5: Relocate vport macros to the vport header file 



These are two macros in the driver general header which deal with the
number of total vports and if a vport is vport manager. Such macros
are vport entities, better to place them at the vport header file.

This patch doesn't change any functionality.

Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b05af6aa

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/notifier.h>

#include <linux/module.h>

#include <linux/mlx5/driver.h>

#include <linux/mlx5/vport.h>

#include <linux/mlx5/eq.h>

#include <linux/mlx5/cmd.h>

#ifdef CONFIG_RFS_ACCEL

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <linux/mutex.h>

#include <linux/mlx5/driver.h>

#include <linux/mlx5/vport.h>

#include <linux/mlx5/eswitch.h>



#include "mlx5_core.h"

include/linux/mlx5/driver.h

+0 −6
Original line number Diff line number Diff line
@@ -1097,12 +1097,6 @@ static inline u16 mlx5_core_max_vfs(struct mlx5_core_dev *dev) 
		return pci_sriov_get_totalvfs(dev->pdev);

}



#define MLX5_TOTAL_VPORTS(mdev) (1 + mlx5_core_max_vfs(mdev))

#define MLX5_VPORT_MANAGER(mdev) \

	(MLX5_CAP_GEN(mdev, vport_group_manager) && \

	 (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) && \

	 mlx5_core_is_pf(mdev))



static inline int mlx5_get_gid_table_len(u16 param)

{

	if (param > 4) {

include/linux/mlx5/vport.h

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/device.h>



#define MLX5_TOTAL_VPORTS(mdev)	(1 + mlx5_core_max_vfs(mdev))



#define MLX5_VPORT_MANAGER(mdev)					\

	(MLX5_CAP_GEN(mdev, vport_group_manager) &&			\

	 (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) &&	\

	 mlx5_core_is_pf(mdev))



enum {

	MLX5_CAP_INLINE_MODE_L2,

	MLX5_CAP_INLINE_MODE_VPORT_CONTEXT,