aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-21 14:25:23 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-21 14:25:23 -0700
commit633d424bf33dab99e77b36210fbd1b996e7823df (patch)
tree59c4c7eca081e93de48a5751346c3883fb4c2dad
parent2aed2827dfc2e7d2e385fc1580529a8fc7f33d47 (diff)
downloadkernel_samsung_espresso10-633d424bf33dab99e77b36210fbd1b996e7823df.zip
kernel_samsung_espresso10-633d424bf33dab99e77b36210fbd1b996e7823df.tar.gz
kernel_samsung_espresso10-633d424bf33dab99e77b36210fbd1b996e7823df.tar.bz2
[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>
-rw-r--r--net/ipv6/route.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1f42bc9..a493ad9 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);