diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-21 11:54:28 -0700 |
| commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a (patch) | |
| tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 /net/ipv6 | |
| parent | d92060bc69233a8175a0c2bfa0d2bce123cace2d (diff) | |
| parent | 23469de647c4c7b68b5d135927b1c509f0e757e6 (diff) | |
| download | lwn-21ea1d36f6dfcb1d59184937c672022d5d01902a.tar.gz lwn-21ea1d36f6dfcb1d59184937c672022d5d01902a.zip | |
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>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 6 |
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; } |