diff options
| author | David S. Miller | 2020-04-20 16:11:31 -0700 |
|---|---|---|
| committer | David S. Miller | 2020-04-20 16:11:31 -0700 |
| commit | 80ad41f28ade9d00ab3c34aa4946349fc82a5233 (patch) | |
| tree | 9a84fd8a24f15054776e23dff381d3e2eb417ee4 /include | |
| parent | 794867ee6730fe3f0d419d3911f35a725cafe3a8 (diff) | |
| parent | 6533380dfd003ea7636cb5672f4f85124b56328b (diff) | |
Merge tag 'mlx5-updates-2020-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2020-04-20
This series includes misc updates and clean ups to mlx5 driver:
1) improve some comments from Hu Haowen.
2) Handles errors of netif_set_real_num_{tx,rx}_queues, from Maxim
3) IPsec and FPGA related code cleanup to prepare for ASIC devices
IPsec offloads, from Raed
4) Allow partial mask for tunnel options, from Roi.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx5/accel.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mlx5/accel.h b/include/linux/mlx5/accel.h index 5613e677a5f9..b919d143a9a6 100644 --- a/include/linux/mlx5/accel.h +++ b/include/linux/mlx5/accel.h @@ -92,6 +92,18 @@ struct mlx5_accel_esp_xfrm_attrs { union { struct aes_gcm_keymat aes_gcm; } keymat; + + union { + __be32 a4; + __be32 a6[4]; + } saddr; + + union { + __be32 a4; + __be32 a6[4]; + } daddr; + + u8 is_ipv6; }; struct mlx5_accel_esp_xfrm { |