Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / net / ipv4 / ipip.c

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 03afa3871efc53b5af543e7d53283be69a02f818..f2696eaadbe69d4d46a2fc576ffff1a13cae8c88 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -592,14 +592,16 @@ static int __net_init ipip_init_net(struct net *net)
        return ip_tunnel_init_net(net, ipip_net_id, &ipip_link_ops, "tunl0");
 }
 
-static void __net_exit ipip_exit_batch_net(struct list_head *list_net)
+static void __net_exit ipip_exit_batch_rtnl(struct list_head *list_net,
+                                           struct list_head *dev_to_kill)
 {
-       ip_tunnel_delete_nets(list_net, ipip_net_id, &ipip_link_ops);
+       ip_tunnel_delete_nets(list_net, ipip_net_id, &ipip_link_ops,
+                             dev_to_kill);
 }
 
 static struct pernet_operations ipip_net_ops = {
        .init = ipip_init_net,
-       .exit_batch = ipip_exit_batch_net,
+       .exit_batch_rtnl = ipip_exit_batch_rtnl,
        .id   = &ipip_net_id,
        .size = sizeof(struct ip_tunnel_net),
 };