Merge git://git.kernel.org/pub/scm/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>

1 files changed, 4 insertions, 2 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 2496b12bf721..e39c284e2954 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4972,12 +4972,14 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
 
                 /* 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, fillargs);
                         if (err < 0)
                                 break;
                         nl_dump_check_consistent(cb, nlmsg_hdr(skb));
+next:
+                        ip_idx++;
                 }
                 break;
         }