diff options
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 475bcd1e418..9b561e633b0 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -871,7 +871,7 @@ static int __init ipip_init(void) | |||
871 | 871 | ||
872 | printk(banner); | 872 | printk(banner); |
873 | 873 | ||
874 | if (xfrm4_tunnel_register(&ipip_handler)) { | 874 | if (xfrm4_tunnel_register(&ipip_handler, AF_INET)) { |
875 | printk(KERN_INFO "ipip init: can't register tunnel\n"); | 875 | printk(KERN_INFO "ipip init: can't register tunnel\n"); |
876 | return -EAGAIN; | 876 | return -EAGAIN; |
877 | } | 877 | } |
@@ -893,7 +893,7 @@ static int __init ipip_init(void) | |||
893 | err2: | 893 | err2: |
894 | free_netdev(ipip_fb_tunnel_dev); | 894 | free_netdev(ipip_fb_tunnel_dev); |
895 | err1: | 895 | err1: |
896 | xfrm4_tunnel_deregister(&ipip_handler); | 896 | xfrm4_tunnel_deregister(&ipip_handler, AF_INET); |
897 | goto out; | 897 | goto out; |
898 | } | 898 | } |
899 | 899 | ||
@@ -913,7 +913,7 @@ static void __exit ipip_destroy_tunnels(void) | |||
913 | 913 | ||
914 | static void __exit ipip_fini(void) | 914 | static void __exit ipip_fini(void) |
915 | { | 915 | { |
916 | if (xfrm4_tunnel_deregister(&ipip_handler)) | 916 | if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) |
917 | printk(KERN_INFO "ipip close: can't deregister tunnel\n"); | 917 | printk(KERN_INFO "ipip close: can't deregister tunnel\n"); |
918 | 918 | ||
919 | rtnl_lock(); | 919 | rtnl_lock(); |