diff options
| author |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 18:49:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 18:49:44 -0700 |
| commit | 628c70da8f6c1d5a3bc3af8ca338f18ee3093438 (patch) | |
| tree | 9a9353127facb79ae1a55d959a405aa78ba96815 | |
| parent | Update DCO ("signoff") rules to 1.1 (diff) | |
| parent | [NETFILTER]: Advance seq-file position in exp_next_seq() (diff) | |
| download | linux-dev-628c70da8f6c1d5a3bc3af8ca338f18ee3093438.tar.xz linux-dev-628c70da8f6c1d5a3bc3af8ca338f18ee3093438.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_standalone.c | 1 |
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 46ca45f74d85..bc59f7b39805 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) |