diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-05-21 15:10:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-21 15:10:31 -0700 |
| commit | ca0f31125c5cf0d48f47c2e1a3785a08876a7e87 (patch) | |
| tree | 8480e770af9b7c2f85e94327db7259c7d86ccf4b /net/core/net_namespace.c | |
| parent | 1f7a2bb4eff75c56a71b3896c36a34e787c5e4e5 (diff) | |
| download | linux-ca0f31125c5cf0d48f47c2e1a3785a08876a7e87.tar.bz2 | |
netns: simplify net_ns_init
The net_ns_init code can be simplified. No need to save error code
if it is only going to panic if it is set 4 lines later.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net_namespace.c')
| -rw-r--r-- | net/core/net_namespace.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 69d7549db9a2..b7292a2719dc 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -196,7 +196,6 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net) static int __init net_ns_init(void) { struct net_generic *ng; - int err; #ifdef CONFIG_NET_NS net_cachep = kmem_cache_create("net_namespace", sizeof(struct net), @@ -216,15 +215,14 @@ static int __init net_ns_init(void) rcu_assign_pointer(init_net.gen, ng); mutex_lock(&net_mutex); - err = setup_net(&init_net); + if (setup_net(&init_net)) + panic("Could not setup the initial network namespace"); rtnl_lock(); list_add_tail(&init_net.list, &net_namespace_list); rtnl_unlock(); mutex_unlock(&net_mutex); - if (err) - panic("Could not setup the initial network namespace"); return 0; } |