aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/loopback.c13
-rw-r--r--include/linux/netdevice.h1
-rw-r--r--net/core/dev.c12
3 files changed, 11 insertions, 15 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index c4516b580ba5..91d08585a6d8 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -204,8 +204,17 @@ static __net_exit void loopback_net_exit(struct net *net)
204 unregister_netdev(dev); 204 unregister_netdev(dev);
205} 205}
206 206
207/* Registered in net/core/dev.c */ 207static struct pernet_operations __net_initdata loopback_net_ops = {
208struct pernet_operations __net_initdata loopback_net_ops = {
209 .init = loopback_net_init, 208 .init = loopback_net_init,
210 .exit = loopback_net_exit, 209 .exit = loopback_net_exit,
211}; 210};
211
212static int __init loopback_init(void)
213{
214 return register_pernet_device(&loopback_net_ops);
215}
216
217/* Loopback is special. It should be initialized before any other network
218 * device and network subsystem.
219 */
220fs_initcall(loopback_init);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 12d7f4469dc9..f1b0dbe58464 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1766,7 +1766,6 @@ static inline int skb_bond_should_drop(struct sk_buff *skb)
1766 return 0; 1766 return 0;
1767} 1767}
1768 1768
1769extern struct pernet_operations __net_initdata loopback_net_ops;
1770#endif /* __KERNEL__ */ 1769#endif /* __KERNEL__ */
1771 1770
1772#endif /* _LINUX_DEV_H */ 1771#endif /* _LINUX_DEV_H */
diff --git a/net/core/dev.c b/net/core/dev.c
index e0dc67a789b7..2306d56fbb5e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4909,18 +4909,6 @@ static int __init net_dev_init(void)
4909 if (register_pernet_subsys(&netdev_net_ops)) 4909 if (register_pernet_subsys(&netdev_net_ops))
4910 goto out; 4910 goto out;
4911 4911
4912 /* The loopback device is special if any other network devices
4913 * is present in a network namespace the loopback device must
4914 * be present. Since we now dynamically allocate and free the
4915 * loopback device ensure this invariant is maintained by
4916 * keeping the loopback device as the first device on the
4917 * list of network devices. Ensuring the loopback devices
4918 * is the first device that appears and the last network device
4919 * that disappears.
4920 */
4921 if (register_pernet_device(&loopback_net_ops))
4922 goto out;
4923
4924 if (register_pernet_device(&default_device_ops)) 4912 if (register_pernet_device(&default_device_ops))
4925 goto out; 4913 goto out;
4926 4914