Commit a70ed9d8 authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 

This series adds some HW bits and definitions for mlx5 driver, to be
used by downstream features in both rdma and netdev branches.

* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

:
  net/mlx5: HW bit for goto chain offload support
  net/mlx5: Expose link speed directly
  net/mlx5: Introduce TLS and IPSec objects enums
  net/mlx5: Introduce egress acl forward-to-vport capability
  net/mlx5: Expose raw packet pacing APIs
  net/mlx5e: Replace zero-length array with flexible-array member
  net/mlx5: fix spelling mistake "reserverd" -> "reserved"

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parents 34a568a2 e0ebd8eb

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

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct mlx5e_tx_wqe { 


struct mlx5e_rx_wqe_ll {

	struct mlx5_wqe_srq_next_seg  next;

	struct mlx5_wqe_data_seg      data[0];

	struct mlx5_wqe_data_seg      data[];

};



struct mlx5e_rx_wqe_cyc {

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct mlx5_fpga_ipsec_cmd_context { 
	struct completion complete;

	struct mlx5_fpga_device *dev;

	struct list_head list; /* Item in pending_cmds */

	u8 command[0];

	u8 command[];

};



struct mlx5_fpga_esp_xfrm;

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

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ struct mlx5_fc_bulk { 
	u32 base_id;

	int bulk_len;

	unsigned long *bitmask;

	struct mlx5_fc fcs[0];

	struct mlx5_fc fcs[];

};



static void mlx5_fc_init(struct mlx5_fc *counter, struct mlx5_fc_bulk *bulk,

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

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct mlx5i_priv { 
	u32    qkey;

	u16    pkey_index;

	struct mlx5i_pkey_qpn_ht *qpn_htbl;

	char  *mlx5e_priv[0];

	char  *mlx5e_priv[];

};



int mlx5i_create_tis(struct mlx5_core_dev *mdev, u32 underlay_qpn, u32 *tisn);
@@ -107,7 +107,7 @@ struct mlx5i_tx_wqe { 
	struct mlx5_wqe_datagram_seg datagram;

	struct mlx5_wqe_eth_pad      pad;

	struct mlx5_wqe_eth_seg      eth;

	struct mlx5_wqe_data_seg     data[0];

	struct mlx5_wqe_data_seg     data[];

};



static inline void mlx5i_sq_fetch_wqe(struct mlx5e_txqsq *sq,

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int mlx5_create_encryption_key(struct mlx5_core_dev *mdev, 


	MLX5_SET(encryption_key_obj, obj, key_size, general_obj_key_size);

	MLX5_SET(encryption_key_obj, obj, key_type,

		 MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_DEK);

		 MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS);

	MLX5_SET(general_obj_in_cmd_hdr, in, opcode,

		 MLX5_CMD_OP_CREATE_GENERAL_OBJECT);

	MLX5_SET(general_obj_in_cmd_hdr, in, obj_type,

CRA Git | Maintained and supported by SUSTech CRA and CCSE