On 13 Aug 09:47, Leon Romanovsky wrote:
Hi, This PR is collected from https://lore.kernel.org/all/cover.1691569414.git.leon@xxxxxxxxxx and contains patches to support mlx5 MACsec RoCEv2. It is based on -rc4 and such has minor conflict with net-next due to existance of IPsec packet offlosd in eswitch code and the resolution is to take both hunks.
Hi Jakub, Are you planing to pull this into net-next?
There's a very minor conflict as described below and I a would like to avoid this on merge window. Thanks, Saeed.
diff --cc include/linux/mlx5/driver.h index 25d0528f9219,3ec8155c405d..000000000000 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@@ -805,6 -806,11 +805,14 @@@ struct mlx5_core_dev u32 vsc_addr; struct mlx5_hv_vhca *hv_vhca; struct mlx5_thermal *thermal; + u64 num_block_tc; + u64 num_block_ipsec; + #ifdef CONFIG_MLX5_MACSEC + struct mlx5_macsec_fs *macsec_fs; + #endif
