diff options
Diffstat (limited to 'net/phonet/pn_dev.c')
| -rw-r--r-- | net/phonet/pn_dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 5bf6341e2dd4..45a7df6575de 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c | |||
| @@ -320,7 +320,7 @@ static int __net_init phonet_init_net(struct net *net) | |||
| 320 | { | 320 | { |
| 321 | struct phonet_net *pnn = phonet_pernet(net); | 321 | struct phonet_net *pnn = phonet_pernet(net); |
| 322 | 322 | ||
| 323 | if (!proc_net_fops_create(net, "phonet", 0, &pn_sock_seq_fops)) | 323 | if (!proc_create("phonet", 0, net->proc_net, &pn_sock_seq_fops)) |
| 324 | return -ENOMEM; | 324 | return -ENOMEM; |
| 325 | 325 | ||
| 326 | INIT_LIST_HEAD(&pnn->pndevs.list); | 326 | INIT_LIST_HEAD(&pnn->pndevs.list); |
| @@ -331,7 +331,7 @@ static int __net_init phonet_init_net(struct net *net) | |||
| 331 | 331 | ||
| 332 | static void __net_exit phonet_exit_net(struct net *net) | 332 | static void __net_exit phonet_exit_net(struct net *net) |
| 333 | { | 333 | { |
| 334 | proc_net_remove(net, "phonet"); | 334 | remove_proc_entry("phonet", net->proc_net); |
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | static struct pernet_operations phonet_net_ops = { | 337 | static struct pernet_operations phonet_net_ops = { |
| @@ -348,7 +348,7 @@ int __init phonet_device_init(void) | |||
| 348 | if (err) | 348 | if (err) |
| 349 | return err; | 349 | return err; |
| 350 | 350 | ||
| 351 | proc_net_fops_create(&init_net, "pnresource", 0, &pn_res_seq_fops); | 351 | proc_create("pnresource", 0, init_net.proc_net, &pn_res_seq_fops); |
| 352 | register_netdevice_notifier(&phonet_device_notifier); | 352 | register_netdevice_notifier(&phonet_device_notifier); |
| 353 | err = phonet_netlink_register(); | 353 | err = phonet_netlink_register(); |
| 354 | if (err) | 354 | if (err) |
| @@ -361,7 +361,7 @@ void phonet_device_exit(void) | |||
| 361 | rtnl_unregister_all(PF_PHONET); | 361 | rtnl_unregister_all(PF_PHONET); |
| 362 | unregister_netdevice_notifier(&phonet_device_notifier); | 362 | unregister_netdevice_notifier(&phonet_device_notifier); |
| 363 | unregister_pernet_subsys(&phonet_net_ops); | 363 | unregister_pernet_subsys(&phonet_net_ops); |
| 364 | proc_net_remove(&init_net, "pnresource"); | 364 | remove_proc_entry("pnresource", init_net.proc_net); |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | int phonet_route_add(struct net_device *dev, u8 daddr) | 367 | int phonet_route_add(struct net_device *dev, u8 daddr) |
