diff options
| author | Kazunori MIYAZAWA <miyazawa@linux-ipv6.org> | 2007-02-13 12:55:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-02-13 12:55:25 -0800 |
| commit | c73cb5a2d607b5b95a06a54d8291ddb659b348b6 (patch) | |
| tree | 9870fa5b73e0492f3f55a75af9cf5afdda95395d /net/ipv6/Kconfig | |
| parent | c0d56408e3ff52d635441e0f08d12164a63728cf (diff) | |
| download | linux-c73cb5a2d607b5b95a06a54d8291ddb659b348b6.tar.gz | |
[IPSEC]: make sit use the xfrm4_tunnel_register
This patch makes sit use xfrm4_tunnel_register instead of inet_add_protocol. It solves conflict of sit device with inter address family IPsec tunnel. Signed-off-by: Kazunori MIYAZAWA <miyazawa@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/Kconfig')
| -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 deb4101a2a81..79682efb14be 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -156,6 +156,7 @@ config INET6_XFRM_MODE_ROUTEOPTIMIZATION config IPV6_SIT tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)" depends on IPV6 + select INET_TUNNEL default y ---help--- Tunneling means encapsulating data of one protocol type within |