diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-06-23 12:48:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-23 12:48:07 -0700 |
| commit | fe87797bf245946e9d07e4a9ca1cd92f48a410d6 (patch) | |
| tree | 02338fc9cecd60ffe4e22644cc4b75b7ccceae15 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff) | |
| parent | net/mlx5: Fix checksum issue of VXLAN and IPsec crypto offload (diff) | |
| download | linux-dev-fe87797bf245946e9d07e4a9ca1cd92f48a410d6.tar.xz linux-dev-fe87797bf245946e9d07e4a9ca1cd92f48a410d6.zip | |
Merge tag 'mlx5-net-next-2021-06-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-net-next-2021-06-22
1) Various minor cleanups and fixes from net-next branch
2) Optimize mlx5 feature check on tx and
a fix to allow Vxlan with Ipsec offloads
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c58a6d4eb610..1d803e890c76 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1024,6 +1024,7 @@ struct xfrm_offload { #define CRYPTO_INVALID_PROTOCOL 128 __u8 proto; + __u8 inner_ipproto; }; struct sec_path { |