From 0d52717e244c1f27779e3d1ff166a92bcca69a87 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 8 Jul 2006 13:38:55 -0700 Subject: [PATCH] --- yaml --- r: 32199 b: refs/heads/master c: 26e0fd1ce2418b10713b569a195bdb679233066b h: refs/heads/master i: 32197: bb1da4d6250922fa1a53cc3c1a0ba26e1380b13f 32195: f891cf04b370b65790dc2c6dd622305bb5dc30cf 32191: 772dbcc8cffa8afecc93c211c657d25c70ffe84d v: v3 --- [refs] | 2 +- trunk/net/decnet/dn_rules.c | 3 ++- trunk/net/ipv4/fib_rules.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d439c40b5444..6cc063a2c638 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a430a43d087545c96542ee64573237919109d370 +refs/heads/master: 26e0fd1ce2418b10713b569a195bdb679233066b diff --git a/trunk/net/decnet/dn_rules.c b/trunk/net/decnet/dn_rules.c index 06e785fe5757..22f321d9bf9d 100644 --- a/trunk/net/decnet/dn_rules.c +++ b/trunk/net/decnet/dn_rules.c @@ -399,9 +399,10 @@ int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); hlist_for_each_entry(r, node, &dn_fib_rules, r_hlist) { if (idx < s_idx) - continue; + goto next; if (dn_fib_fill_rule(skb, r, cb, NLM_F_MULTI) < 0) break; +next: idx++; } rcu_read_unlock(); diff --git a/trunk/net/ipv4/fib_rules.c b/trunk/net/ipv4/fib_rules.c index 6c642d11d4ca..773b12ba4e3c 100644 --- a/trunk/net/ipv4/fib_rules.c +++ b/trunk/net/ipv4/fib_rules.c @@ -457,13 +457,13 @@ int inet_dump_rules(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); hlist_for_each_entry(r, node, &fib_rules, hlist) { - if (idx < s_idx) - continue; + goto next; if (inet_fill_rule(skb, r, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, RTM_NEWRULE, NLM_F_MULTI) < 0) break; +next: idx++; } rcu_read_unlock();