diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 21:49:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 21:49:44 -0400 |
| commit | 628c70da8f6c1d5a3bc3af8ca338f18ee3093438 (patch) | |
| tree | 9a9353127facb79ae1a55d959a405aa78ba96815 | |
| parent | cbd83da82b15292337ff2b71e619c9a3a95f6d80 (diff) | |
| parent | a96aca88ac71f75e566981b554da44bfd0d111e8 (diff) | |
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) | |||
| 256 | { | 256 | { |
| 257 | struct list_head *e = v; | 257 | struct list_head *e = v; |
| 258 | 258 | ||
| 259 | ++*pos; | ||
| 259 | e = e->next; | 260 | e = e->next; |
| 260 | 261 | ||
| 261 | if (e == &ip_conntrack_expect_list) | 262 | if (e == &ip_conntrack_expect_list) |