From 5d62b70127a0a3709d020a129fbc6898ca47a8a2 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 2 Dec 2009 13:19:08 +0000 Subject: [PATCH] --- yaml --- r: 172114 b: refs/heads/master c: 91e2ff3528ac90b9dbcb04b76488e8ad74e3d3d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c1a589344b51..d7ebd723c0b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 650de8de16aa7c168c34d1b6a3191e4a5e2648c8 +refs/heads/master: 91e2ff3528ac90b9dbcb04b76488e8ad74e3d3d9 diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index 91e9073e1995..ec3769295dac 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -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 @@ static int __init vlan_proto_init(void) 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();