diff options
author | David S. Miller <davem@davemloft.net> | 2020-06-19 13:03:47 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-06-19 13:03:47 -0700 |
commit | 0e5f9d50ad969480ae3331f3802250e39327fb50 (patch) | |
tree | 963d1d0c0d29e7cdbc965c8be7915ab429c3bc05 /include | |
parent | 7b075ad9f496d18f45c8835cef2ae058eb6f8371 (diff) | |
parent | be01369859b8aa07346e497381bb46d377da0d8c (diff) | |
download | linux-stable-0e5f9d50ad969480ae3331f3802250e39327fb50.tar.gz linux-stable-0e5f9d50ad969480ae3331f3802250e39327fb50.tar.bz2 linux-stable-0e5f9d50ad969480ae3331f3802250e39327fb50.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2020-06-19
1) Fix double ESP trailer insertion in IPsec crypto offload if
netif_xmit_frozen_or_stopped is true. From Huy Nguyen.
2) Merge fixup for "remove output_finish indirection from
xfrm_state_afinfo". From Stephen Rothwell.
3) Select CRYPTO_SEQIV for ESP as this is needed for GCM and several
other encryption algorithms. Also modernize the crypto algorithm
selections for ESP and AH, remove those that are maked as "MUST NOT"
and add those that are marked as "MUST" be implemented in RFC 8221.
From Eric Biggers.
Please note the merge conflict between commit:
a7f7f6248d97 ("treewide: replace '---help---' in Kconfig files with 'help'")
from Linus' tree and commits:
7d4e39195925 ("esp, ah: consolidate the crypto algorithm selections")
be01369859b8 ("esp, ah: modernize the crypto algorithm selections")
from the ipsec tree.
====================
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 094fe682f5d7..c7d213c9f9d8 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1008,6 +1008,7 @@ struct xfrm_offload { #define XFRM_GRO 32 #define XFRM_ESP_NO_TRAILER 64 #define XFRM_DEV_RESUME 128 +#define XFRM_XMIT 256 __u32 status; #define CRYPTO_SUCCESS 1 |