diff options
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 210a079cfc6f..a493ad9b8914 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -150,7 +150,7 @@ static struct rt6_info ip6_null_entry_template = { | |||
150 | static int ip6_pkt_prohibit(struct sk_buff *skb); | 150 | static int ip6_pkt_prohibit(struct sk_buff *skb); |
151 | static int ip6_pkt_prohibit_out(struct sk_buff *skb); | 151 | static int ip6_pkt_prohibit_out(struct sk_buff *skb); |
152 | 152 | ||
153 | struct rt6_info ip6_prohibit_entry_template = { | 153 | static struct rt6_info ip6_prohibit_entry_template = { |
154 | .u = { | 154 | .u = { |
155 | .dst = { | 155 | .dst = { |
156 | .__refcnt = ATOMIC_INIT(1), | 156 | .__refcnt = ATOMIC_INIT(1), |
@@ -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); |