diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /net/ipv6/addrconf.c | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 21b4c9e1a682..1c58b99a54a4 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -3607,7 +3607,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, | |||
| 3607 | hlist_for_each_entry_rcu(dev, node, head, index_hlist) { | 3607 | hlist_for_each_entry_rcu(dev, node, head, index_hlist) { |
| 3608 | if (idx < s_idx) | 3608 | if (idx < s_idx) |
| 3609 | goto cont; | 3609 | goto cont; |
| 3610 | if (idx > s_idx) | 3610 | if (h > s_h || idx > s_idx) |
| 3611 | s_ip_idx = 0; | 3611 | s_ip_idx = 0; |
| 3612 | ip_idx = 0; | 3612 | ip_idx = 0; |
| 3613 | idev = __in6_dev_get(dev); | 3613 | idev = __in6_dev_get(dev); |