diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-01 09:57:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-01 09:57:04 -0700 |
| commit | 08daaec742d170eabe7f8355c2f86fc8be166f10 (patch) | |
| tree | 27f1f3eda0433788d05271cc1e8c7f06af23e973 /include/net | |
| parent | 8fd682072335e98b53823c89efa4d2460e79a3d5 (diff) | |
| parent | 8598112d04af21cf6c895670e72dcb8a9f58e74f (diff) | |
| download | op-kernel-dev-08daaec742d170eabe7f8355c2f86fc8be166f10.zip op-kernel-dev-08daaec742d170eabe7f8355c2f86fc8be166f10.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2017-09-01
This should be the last ipsec-next pull request for this
release cycle:
1) Support netdevice ESP trailer removal when decryption
is offloaded. From Yossi Kuperman.
2) Fix overwritten return value of copy_sec_ctx().
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -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 9c7b70c..f002a2c 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1019,6 +1019,7 @@ struct xfrm_offload { #define CRYPTO_FALLBACK 8 #define XFRM_GSO_SEGMENT 16 #define XFRM_GRO 32 +#define XFRM_ESP_NO_TRAILER 64 __u32 status; #define CRYPTO_SUCCESS 1 |
