diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1aa07047826e..e7e728aea9f3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2611,7 +2611,7 @@ static const struct file_operations ptype_seq_fops = { | |||
2611 | }; | 2611 | }; |
2612 | 2612 | ||
2613 | 2613 | ||
2614 | static int dev_proc_net_init(struct net *net) | 2614 | static int __net_init dev_proc_net_init(struct net *net) |
2615 | { | 2615 | { |
2616 | int rc = -ENOMEM; | 2616 | int rc = -ENOMEM; |
2617 | 2617 | ||
@@ -2636,7 +2636,7 @@ out_dev: | |||
2636 | goto out; | 2636 | goto out; |
2637 | } | 2637 | } |
2638 | 2638 | ||
2639 | static void dev_proc_net_exit(struct net *net) | 2639 | static void __net_exit dev_proc_net_exit(struct net *net) |
2640 | { | 2640 | { |
2641 | wext_proc_exit(net); | 2641 | wext_proc_exit(net); |
2642 | 2642 | ||
@@ -2645,7 +2645,7 @@ static void dev_proc_net_exit(struct net *net) | |||
2645 | proc_net_remove(net, "dev"); | 2645 | proc_net_remove(net, "dev"); |
2646 | } | 2646 | } |
2647 | 2647 | ||
2648 | static struct pernet_operations dev_proc_ops = { | 2648 | static struct pernet_operations __net_initdata dev_proc_ops = { |
2649 | .init = dev_proc_net_init, | 2649 | .init = dev_proc_net_init, |
2650 | .exit = dev_proc_net_exit, | 2650 | .exit = dev_proc_net_exit, |
2651 | }; | 2651 | }; |
@@ -4278,7 +4278,7 @@ static struct hlist_head *netdev_create_hash(void) | |||
4278 | } | 4278 | } |
4279 | 4279 | ||
4280 | /* Initialize per network namespace state */ | 4280 | /* Initialize per network namespace state */ |
4281 | static int netdev_init(struct net *net) | 4281 | static int __net_init netdev_init(struct net *net) |
4282 | { | 4282 | { |
4283 | INIT_LIST_HEAD(&net->dev_base_head); | 4283 | INIT_LIST_HEAD(&net->dev_base_head); |
4284 | rwlock_init(&dev_base_lock); | 4284 | rwlock_init(&dev_base_lock); |
@@ -4299,18 +4299,18 @@ err_name: | |||
4299 | return -ENOMEM; | 4299 | return -ENOMEM; |
4300 | } | 4300 | } |
4301 | 4301 | ||
4302 | static void netdev_exit(struct net *net) | 4302 | static void __net_exit netdev_exit(struct net *net) |
4303 | { | 4303 | { |
4304 | kfree(net->dev_name_head); | 4304 | kfree(net->dev_name_head); |
4305 | kfree(net->dev_index_head); | 4305 | kfree(net->dev_index_head); |
4306 | } | 4306 | } |
4307 | 4307 | ||
4308 | static struct pernet_operations netdev_net_ops = { | 4308 | static struct pernet_operations __net_initdata netdev_net_ops = { |
4309 | .init = netdev_init, | 4309 | .init = netdev_init, |
4310 | .exit = netdev_exit, | 4310 | .exit = netdev_exit, |
4311 | }; | 4311 | }; |
4312 | 4312 | ||
4313 | static void default_device_exit(struct net *net) | 4313 | static void __net_exit default_device_exit(struct net *net) |
4314 | { | 4314 | { |
4315 | struct net_device *dev, *next; | 4315 | struct net_device *dev, *next; |
4316 | /* | 4316 | /* |
@@ -4336,7 +4336,7 @@ static void default_device_exit(struct net *net) | |||
4336 | rtnl_unlock(); | 4336 | rtnl_unlock(); |
4337 | } | 4337 | } |
4338 | 4338 | ||
4339 | static struct pernet_operations default_device_ops = { | 4339 | static struct pernet_operations __net_initdata default_device_ops = { |
4340 | .exit = default_device_exit, | 4340 | .exit = default_device_exit, |
4341 | }; | 4341 | }; |
4342 | 4342 | ||