diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-27 16:19:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-27 16:19:41 -0500 |
| commit | 23187212e7c3664f6a0d8ccd83b6d32c05aeafcb (patch) | |
| tree | 68e3c4c32c1295bb65da6f936be890290670c992 /net/ipv6 | |
| parent | bf439b3154ce49d81a79b14f9fab18af99018ae2 (diff) | |
| parent | 3a9016f97fdc8bfbb26ff36ba8f3dc9162eb691b (diff) | |
| download | linux-23187212e7c3664f6a0d8ccd83b6d32c05aeafcb.tar.gz linux-23187212e7c3664f6a0d8ccd83b6d32c05aeafcb.tar.bz2 linux-23187212e7c3664f6a0d8ccd83b6d32c05aeafcb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) Build fix for ip_vti when NET_IP_TUNNEL is not set.
We need this set to have ip_tunnel_get_stats64()
available.
2) Fix a NULL pointer dereference on sub policy usage.
We try to access a xfrm_state from the wrong array.
3) Take xfrm_state_lock in xfrm_migrate_state_find(),
we need it to traverse through the state lists.
4) Clone states properly on migration, otherwise we crash
when we migrate a state with aead algorithm attached.
5) Fix unlink race when between thread context and timer
when policies are deleted.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index d92e5586783e..438a73aa777c 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -138,6 +138,7 @@ config INET6_XFRM_MODE_ROUTEOPTIMIZATION config IPV6_VTI tristate "Virtual (secure) IPv6: tunneling" select IPV6_TUNNEL + select NET_IP_TUNNEL depends on INET6_XFRM_MODE_TUNNEL ---help--- Tunneling means encapsulating data of one protocol type within |