From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Oct 2017 03:11:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.15-rc1~84^2~508
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14
diff --cc net/ipv6/route.c
index 3d7d4e09301ef,a96d5b385d8fa..13b0d6d1cc303
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -1877,10 -1325,9 +1877,10 @@@ struct dst_entry *ip6_blackhole_route(s
  	struct dst_entry *new = NULL;
  
  	rt = dst_alloc(&ip6_dst_blackhole_ops, loopback_dev, 1,
- 		       DST_OBSOLETE_NONE, 0);
+ 		       DST_OBSOLETE_DEAD, 0);
  	if (rt) {
  		rt6_info_init(rt);
 +		atomic_inc(&net->ipv6.rt6_stats->fib_rt_alloc);
  
  		new = &rt->dst;
  		new->__use = 1;