From: David S. Miller <davem@davemloft.net>
Date: Sun, 21 Oct 2018 18:54:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=21ea1d36f6dfcb1d59184937c672022d5d01902a;p=linux.git

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

David Ahern's dump indexing bug fix in 'net' overlapped the
change of the function signature of inet6_fill_ifaddr() in
'net-next'.  Trivially resolved.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

21ea1d36f6dfcb1d59184937c672022d5d01902a
diff --cc net/ipv6/addrconf.c
index 2496b12bf721e,4e81ff2f45882..e39c284e29541
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@@ -4972,9 -4928,13 +4972,9 @@@ static int in6_dump_addrs(struct inet6_
  
  		/* unicast address incl. temp addr */
  		list_for_each_entry(ifa, &idev->addr_list, if_list) {
- 			if (++ip_idx < s_ip_idx)
- 				continue;
+ 			if (ip_idx < s_ip_idx)
+ 				goto next;
 -			err = inet6_fill_ifaddr(skb, ifa,
 -						NETLINK_CB(cb->skb).portid,
 -						cb->nlh->nlmsg_seq,
 -						RTM_NEWADDR,
 -						NLM_F_MULTI);
 +			err = inet6_fill_ifaddr(skb, ifa, fillargs);
  			if (err < 0)
  				break;
  			nl_dump_check_consistent(cb, nlmsg_hdr(skb));