Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD

* HEAD:
  [AX.25]: Use kzalloc
  [ATM] net/atm/clip.c: fix PROC_FS=n compile
  [PKT_SCHED]: act_api: Fix module leak while flushing actions
  [NET]: Fix IPv4/DECnet routing rule dumping
  [NET] gso: Fix up GSO packets with broken checksums
  [NET] gso: Add skb_is_gso
  [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
  [ATM]: fix possible recursive locking in skb_migrate()
  [ATM]: Typo in drivers/atm/Kconfig...
  [TG3]: add amd8131 to "write reorder" chipsets
  [NET]: Fix network device interface printk message priority

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 6c642d11d4ca..773b12ba4e3c 100644
--- a/net/ipv4/fib_rules.c
+++ b/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();