aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 18:49:44 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 18:49:44 -0700
commit628c70da8f6c1d5a3bc3af8ca338f18ee3093438 (patch)
tree9a9353127facb79ae1a55d959a405aa78ba96815
parentcbd83da82b15292337ff2b71e619c9a3a95f6d80 (diff)
parenta96aca88ac71f75e566981b554da44bfd0d111e8 (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
-rw-r--r--net/ipv4/netfilter/ip_conntrack_standalone.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 46ca45f74d8..bc59f7b3980 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -256,6 +256,7 @@ static void *exp_seq_next(struct seq_file *s, void *v, loff_t *pos)
{
struct list_head *e = v;
+ ++*pos;
e = e->next;
if (e == &ip_conntrack_expect_list)