diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-24 20:39:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-24 20:39:30 -0700 |
| commit | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /net/ipv6 | |
| parent | e89227889cec6b66758b44c83f78dba337e5d699 (diff) | |
| parent | 7686ee1ad976efeddf10583f013462c66408ae51 (diff) | |
| download | linux-6b6a93c6876ea1c530d5d3f68e3678093a27fab0.tar.gz linux-6b6a93c6876ea1c530d5d3f68e3678093a27fab0.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index f39ddeae1eef..09613729404c 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1123,7 +1123,7 @@ static inline int ip6ip6_register(void) static inline int ip6ip6_unregister(void) { - return xfrm6_tunnel_unregister(&ip6ip6_handler); + return xfrm6_tunnel_deregister(&ip6ip6_handler); } #else static struct inet6_protocol xfrm6_tunnel_protocol = { |