diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-29 13:02:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-29 13:02:33 -0700 |
| commit | f26e9b2c0bf3a7a515b2e92763182bcd81628a5f (patch) | |
| tree | 68d7c6d5fe19bbc2f2c6f0f194391f2bbc1703d4 /net/ipv4/Kconfig | |
| parent | 830f5ce266ce79e18f0026c36c99319b1bc08e1b (diff) | |
| parent | 7d4343d501f9b5ddbc92f278adba339d16d010e1 (diff) | |
| download | linux-f26e9b2c0bf3a7a515b2e92763182bcd81628a5f.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 2020-05-29
1) Add IPv6 encapsulation support for ESP over UDP and TCP.
From Sabrina Dubroca.
2) Remove unneeded reference when initializing xfrm interfaces.
From Nicolas Dichtel.
3) Remove some indirect calls from the state_afinfo.
From Florian Westphal.
Please note that this pull request has two merge conflicts
between commit:
0c922a4850eb ("xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish")
from Linus' tree and commit:
2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
from the ipsec-next tree.
and between commit:
3986912f6a9a ("ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl")
from the net-next tree and commit:
0146dca70b87 ("xfrm: add support for UDPv6 encapsulation of ESP")
from the ipsec-next tree.
Both conflicts can be resolved as done in linux-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 5da4733067fb2f..23ba5045e3d3c1 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -384,6 +384,7 @@ config INET_ESPINTCP depends on XFRM && INET_ESP select STREAM_PARSER select NET_SOCK_MSG + select XFRM_ESPINTCP help Support for RFC 8229 encapsulation of ESP and IKE over TCP/IPv4 sockets. |