From d0b2d491d2e0e7c75f91cfa0d5d7559d471d25e6 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 1 Jun 2013 15:36:02 +0200 Subject: [PATCH] --- yaml --- r: 377002 b: refs/heads/master c: 37bc4f8dfa72fb43b84381abca39cfdbbc8ff2df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink_cttimeout.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d1e1ac484c1..0747381da2c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 991a6b735ff47710769545b11e481bb140b2e6f7 +refs/heads/master: 37bc4f8dfa72fb43b84381abca39cfdbbc8ff2df diff --git a/trunk/net/netfilter/nfnetlink_cttimeout.c b/trunk/net/netfilter/nfnetlink_cttimeout.c index 701c88a20fea..65074dfb9383 100644 --- a/trunk/net/netfilter/nfnetlink_cttimeout.c +++ b/trunk/net/netfilter/nfnetlink_cttimeout.c @@ -220,9 +220,12 @@ ctnl_timeout_dump(struct sk_buff *skb, struct netlink_callback *cb) rcu_read_lock(); list_for_each_entry_rcu(cur, &cttimeout_list, head) { - if (last && cur != last) - continue; + if (last) { + if (cur != last) + continue; + last = NULL; + } if (ctnl_timeout_fill_info(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NFNL_MSG_TYPE(cb->nlh->nlmsg_type),