From 22c014f2ffc4d752e9267bdc1beb02f5f019c657 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 6 Apr 2012 15:35:39 +0000 Subject: [PATCH] --- yaml --- r: 299517 b: refs/heads/master c: 03478756b1b9298686ca9c8793e484ae39eb4649 h: refs/heads/master i: 299515: c1afe1c136c2637621fc7fccc7ed1c73ed7f2c17 v: v3 --- [refs] | 2 +- trunk/net/phonet/pn_dev.c | 21 ++------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index ca90cf736008..fb36b62f2db0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d3d43dab4e978d8d9ad1acf8af15c9b1c4b0f0f +refs/heads/master: 03478756b1b9298686ca9c8793e484ae39eb4649 diff --git a/trunk/net/phonet/pn_dev.c b/trunk/net/phonet/pn_dev.c index 9b9a85ecc4c7..bf5cf69c820a 100644 --- a/trunk/net/phonet/pn_dev.c +++ b/trunk/net/phonet/pn_dev.c @@ -331,23 +331,6 @@ static int __net_init phonet_init_net(struct net *net) static void __net_exit phonet_exit_net(struct net *net) { - struct phonet_net *pnn = phonet_pernet(net); - struct net_device *dev; - unsigned i; - - rtnl_lock(); - for_each_netdev(net, dev) - phonet_device_destroy(dev); - - for (i = 0; i < 64; i++) { - dev = pnn->routes.table[i]; - if (dev) { - rtm_phonet_notify(RTM_DELROUTE, dev, i); - dev_put(dev); - } - } - rtnl_unlock(); - proc_net_remove(net, "phonet"); } @@ -361,7 +344,7 @@ static struct pernet_operations phonet_net_ops = { /* Initialize Phonet devices list */ int __init phonet_device_init(void) { - int err = register_pernet_device(&phonet_net_ops); + int err = register_pernet_subsys(&phonet_net_ops); if (err) return err; @@ -377,7 +360,7 @@ void phonet_device_exit(void) { rtnl_unregister_all(PF_PHONET); unregister_netdevice_notifier(&phonet_device_notifier); - unregister_pernet_device(&phonet_net_ops); + unregister_pernet_subsys(&phonet_net_ops); proc_net_remove(&init_net, "pnresource"); }