diff options
authorPavel Emelyanov <xemul@openvz.org>2007-11-01 00:45:59 -0700
committerDavid S. Miller <davem@davemloft.net>2007-11-01 00:45:59 -0700
commit1a2ee93d281d00cc6e2db1c306032a105d2c9474 (patch)
parent[NET]: Hide the dead code in the net_namespace.c (diff)
[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 <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index d5bf8b28bbf4..a044e2d9a8f0 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;