return 0;
 }
 
-static void geneve_destroy_tunnels(struct net *net, struct list_head *head)
+static void __net_exit geneve_exit_rtnl_net(struct net *net,
+                                           struct list_head *dev_to_kill)
 {
        struct geneve_net *gn = net_generic(net, geneve_net_id);
        struct geneve_dev *geneve, *next;
 
        list_for_each_entry_safe(geneve, next, &gn->geneve_list, next)
-               geneve_dellink(geneve->dev, head);
-}
-
-static void __net_exit geneve_exit_batch_rtnl(struct list_head *net_list,
-                                             struct list_head *dev_to_kill)
-{
-       struct net *net;
-
-       list_for_each_entry(net, net_list, exit_list)
-               geneve_destroy_tunnels(net, dev_to_kill);
+               geneve_dellink(geneve->dev, dev_to_kill);
 }
 
 static void __net_exit geneve_exit_net(struct net *net)
 
 static struct pernet_operations geneve_net_ops = {
        .init = geneve_init_net,
-       .exit_batch_rtnl = geneve_exit_batch_rtnl,
+       .exit_rtnl = geneve_exit_rtnl_net,
        .exit = geneve_exit_net,
        .id   = &geneve_net_id,
        .size = sizeof(struct geneve_net),