diff --git a/[refs] b/[refs] index f311cdc918f3..987832f5246d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2aed2827dfc2e7d2e385fc1580529a8fc7f33d47 +refs/heads/master: 633d424bf33dab99e77b36210fbd1b996e7823df diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 1f42bc960bd5..a493ad9b8914 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/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);