From: David S. Miller <davem@davemloft.net>
Date: Tue, 22 Aug 2017 00:06:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.14-rc1~130^2~179
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2a7c34fb2856fd5306e307e170e3dde358d0dce;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/net
---

e2a7c34fb2856fd5306e307e170e3dde358d0dce
diff --cc net/ipv6/ip6_fib.c
index 8c58c75,5cc0ea0..549aacc
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@@ -1011,8 -913,9 +1011,10 @@@ add
  			fn->fn_flags |= RTN_RTINFO;
  		}
  		nsiblings = iter->rt6i_nsiblings;
 +		iter->rt6i_node = NULL;
  		fib6_purge_rt(iter, fn, info->nl_net);
+ 		if (fn->rr_ptr == iter)
+ 			fn->rr_ptr = NULL;
  		rt6_release(iter);
  
  		if (nsiblings) {
@@@ -1024,8 -927,9 +1026,10 @@@
  					break;
  				if (rt6_qualify_for_ecmp(iter)) {
  					*ins = iter->dst.rt6_next;
 +					iter->rt6i_node = NULL;
  					fib6_purge_rt(iter, fn, info->nl_net);
+ 					if (fn->rr_ptr == iter)
+ 						fn->rr_ptr = NULL;
  					rt6_release(iter);
  					nsiblings--;
  				} else {