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

Commit bb909416 authored by Ilya Lesokhin's avatar Ilya Lesokhin Committed by David S. Miller
Browse files

net/mlx5e: Move defines out of ipsec code 



The defines are not IPSEC specific.

Signed-off-by: default avatarIlya Lesokhin <ilyal@mellanox.com>
Signed-off-by: default avatarBoris Pismenny <borisp@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8f69799

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

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 


struct page_pool;



#define MLX5E_METADATA_ETHER_TYPE (0x8CE4)

#define MLX5E_METADATA_ETHER_LEN 8



#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)



#define MLX5E_ETH_HARD_MTU (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN)

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
#define MLX5E_IPSEC_SADB_RX_BITS 10

#define MLX5E_IPSEC_ESN_SCOPE_MID 0x80000000L



#define MLX5E_METADATA_ETHER_TYPE (0x8CE4)

#define MLX5E_METADATA_ETHER_LEN 8



struct mlx5e_priv;



struct mlx5e_ipsec_sw_stats {

drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c

+1 −4
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ 
#include "fpga/sdk.h"

#include "fpga/core.h"



#define SBU_QP_QUEUE_SIZE 8

#define MLX5_FPGA_IPSEC_CMD_TIMEOUT_MSEC	(60 * 1000)



enum mlx5_fpga_ipsec_cmd_status {

	MLX5_FPGA_IPSEC_CMD_PENDING,

	MLX5_FPGA_IPSEC_CMD_SEND_FAIL,
@@ -258,7 +255,7 @@ static int mlx5_fpga_ipsec_cmd_wait(void *ctx) 
{

	struct mlx5_fpga_ipsec_cmd_context *context = ctx;

	unsigned long timeout =

		msecs_to_jiffies(MLX5_FPGA_IPSEC_CMD_TIMEOUT_MSEC);

		msecs_to_jiffies(MLX5_FPGA_CMD_TIMEOUT_MSEC);

	int res;



	res = wait_for_completion_timeout(&context->complete, timeout);

drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
 * DOC: Innova SDK

 * This header defines the in-kernel API for Innova FPGA client drivers.

 */

#define SBU_QP_QUEUE_SIZE 8

#define MLX5_FPGA_CMD_TIMEOUT_MSEC (60 * 1000)



enum mlx5_fpga_access_type {

	MLX5_FPGA_ACCESS_TYPE_I2C = 0x0,