[IPSEC]: make sit use the xfrm4_tunnel_register
authorKazunori MIYAZAWA <miyazawa@linux-ipv6.org>
Tue, 13 Feb 2007 20:55:25 +0000 (12:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Feb 2007 20:55:25 +0000 (12:55 -0800)
commitc73cb5a2d607b5b95a06a54d8291ddb659b348b6
tree9870fa5b73e0492f3f55a75af9cf5afdda95395d
parentc0d56408e3ff52d635441e0f08d12164a63728cf
[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>
net/ipv6/Kconfig
net/ipv6/sit.c