diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-21 17:25:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-21 17:25:23 -0400 |
commit | 633d424bf33dab99e77b36210fbd1b996e7823df (patch) | |
tree | 59c4c7eca081e93de48a5751346c3883fb4c2dad | |
parent | 2aed2827dfc2e7d2e385fc1580529a8fc7f33d47 (diff) |
[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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1f42bc960bd5..a493ad9b8914 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) | |||
2614 | 2614 | ||
2615 | static int ip6_route_net_init(struct net *net) | 2615 | static int ip6_route_net_init(struct net *net) |
2616 | { | 2616 | { |
2617 | int ret = 0; | 2617 | int ret = -ENOMEM; |
2618 | 2618 | ||
2619 | ret = -ENOMEM; | ||
2620 | net->ipv6.ip6_dst_ops = kmemdup(&ip6_dst_ops_template, | 2619 | net->ipv6.ip6_dst_ops = kmemdup(&ip6_dst_ops_template, |
2621 | sizeof(*net->ipv6.ip6_dst_ops), | 2620 | sizeof(*net->ipv6.ip6_dst_ops), |
2622 | GFP_KERNEL); | 2621 | GFP_KERNEL); |