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

Commit ae9f83ac authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx5: Move alloc/dealloc encap commands declarations to common header file 



The alloc and dealloc encap commands will be used in the mlx5e driver,
as such, declare them in a common header file.

Also, rename the functions: mlx5_cmd_{de}alloc_encap is replaced with
mlx5_encap_{de}alloc.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75bfbca0

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

+6 −6
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ void mlx5_cmd_fc_bulk_get(struct mlx5_core_dev *dev, 


#define MAX_ENCAP_SIZE (128)



int mlx5_cmd_alloc_encap(struct mlx5_core_dev *dev,

int mlx5_encap_alloc(struct mlx5_core_dev *dev,

		     int header_type,

		     size_t size,

		     void *encap_header,
@@ -488,7 +488,7 @@ int mlx5_cmd_alloc_encap(struct mlx5_core_dev *dev, 
	return err;

}



void mlx5_cmd_dealloc_encap(struct mlx5_core_dev *dev, u32 encap_id)

void mlx5_encap_dealloc(struct mlx5_core_dev *dev, u32 encap_id)

{

	u32 in[MLX5_ST_SZ_DW(dealloc_encap_header_in)];

	u32 out[MLX5_ST_SZ_DW(dealloc_encap_header_out)];

drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h

+0 −7
Original line number Diff line number Diff line
@@ -89,11 +89,4 @@ void mlx5_cmd_fc_bulk_get(struct mlx5_core_dev *dev, 
			  struct mlx5_cmd_fc_bulk *b, u16 id,

			  u64 *packets, u64 *bytes);



int mlx5_cmd_alloc_encap(struct mlx5_core_dev *dev,

			 int header_type,

			 size_t size,

			 void *encap_header,

			 u32 *encap_id);

void mlx5_cmd_dealloc_encap(struct mlx5_core_dev *dev, u32 encap_id);



#endif

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ struct mlx5_core_dev *mlx5_get_next_phys_dev(struct mlx5_core_dev *dev); 
void mlx5_dev_list_lock(void);

void mlx5_dev_list_unlock(void);

int mlx5_dev_list_trylock(void);

int mlx5_encap_alloc(struct mlx5_core_dev *dev,

		     int header_type,

		     size_t size,

		     void *encap_header,

		     u32 *encap_id);

void mlx5_encap_dealloc(struct mlx5_core_dev *dev, u32 encap_id);



bool mlx5_lag_intf_add(struct mlx5_interface *intf, struct mlx5_priv *priv);