From: Pavel Emelyanov Date: Thu, 1 Nov 2007 07:45:59 +0000 (-0700) Subject: [NET]: Mark the setup_net as __net_init X-Git-Tag: v2.6.24-rc2~56^2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a2ee93d281d00cc6e2db1c306032a105d2c9474;p=linux-2.6 [NET]: Mark the setup_net as __net_init The setup_net is called for the init net namespace only (int the CONFIG_NET_NS=n of course) from the __init function, so mark it as __net_init to disappear with the caller after the boot. Yet again, in the perfect world this has to be under #ifdef CONFIG_NET_NS, but it isn't guaranteed that every subsystem is registered *after* the init_net_ns is set up. After we are sure, that we don't start registering them before the init net setup, we'll be able to move this code under the ifdef. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller --- diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index d5bf8b28bb..a044e2d9a8 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -25,7 +25,7 @@ EXPORT_SYMBOL_GPL(init_net); /* * setup_net runs the initializers for the network namespace object. */ -static int setup_net(struct net *net) +static __net_init int setup_net(struct net *net) { /* Must be called with net_mutex held */ struct pernet_operations *ops;