From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 21 Apr 2008 21:25:23 +0000 (-0700)
Subject: [NETNS]: Don't initialize err variable twice.
X-Git-Tag: v2.6.26-rc1~1095^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=633d424bf33dab99e77b36210fbd1b996e7823df;p=linux-2.6-omap-h63xx.git

[NETNS]: Don't initialize err variable twice.

The ip6_route_net_init() performs some unneeded actions.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1f42bc960bd..a493ad9b891 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2614,9 +2614,8 @@ struct ctl_table *ipv6_route_sysctl_init(struct net *net)
 
 static int ip6_route_net_init(struct net *net)
 {
-	int ret = 0;
+	int ret = -ENOMEM;
 
-	ret = -ENOMEM;
 	net->ipv6.ip6_dst_ops = kmemdup(&ip6_dst_ops_template,
 					sizeof(*net->ipv6.ip6_dst_ops),
 					GFP_KERNEL);