|
@@ -698,8 +698,6 @@ static int vlan_init_net(struct net *net)
|
|
|
|
|
|
static void vlan_exit_net(struct net *net)
|
|
|
{
|
|
|
- rtnl_kill_links(net, &vlan_link_ops);
|
|
|
-
|
|
|
vlan_proc_cleanup(net);
|
|
|
}
|
|
|
|
|
@@ -717,7 +715,7 @@ static int __init vlan_proto_init(void)
|
|
|
pr_info("%s v%s %s\n", vlan_fullname, vlan_version, vlan_copyright);
|
|
|
pr_info("All bugs added by %s\n", vlan_buggyright);
|
|
|
|
|
|
- err = register_pernet_device(&vlan_net_ops);
|
|
|
+ err = register_pernet_subsys(&vlan_net_ops);
|
|
|
if (err < 0)
|
|
|
goto err0;
|
|
|
|
|
@@ -742,7 +740,7 @@ err4:
|
|
|
err3:
|
|
|
unregister_netdevice_notifier(&vlan_notifier_block);
|
|
|
err2:
|
|
|
- unregister_pernet_device(&vlan_net_ops);
|
|
|
+ unregister_pernet_subsys(&vlan_net_ops);
|
|
|
err0:
|
|
|
return err;
|
|
|
}
|
|
@@ -762,7 +760,7 @@ static void __exit vlan_cleanup_module(void)
|
|
|
for (i = 0; i < VLAN_GRP_HASH_SIZE; i++)
|
|
|
BUG_ON(!hlist_empty(&vlan_group_hash[i]));
|
|
|
|
|
|
- unregister_pernet_device(&vlan_net_ops);
|
|
|
+ unregister_pernet_subsys(&vlan_net_ops);
|
|
|
rcu_barrier(); /* Wait for completion of call_rcu()'s */
|
|
|
|
|
|
vlan_gvrp_uninit();
|