| commit | 628c70da8f6c1d5a3bc3af8ca338f18ee3093438 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Mon Jun 13 18:49:44 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Mon Jun 13 18:49:44 2005 -0700 |
| tree | 9a9353127facb79ae1a55d959a405aa78ba96815 | |
| parent | cbd83da82b15292337ff2b71e619c9a3a95f6d80 [diff] | |
| parent | a96aca88ac71f75e566981b554da44bfd0d111e8 [diff] |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index 46ca45f..bc59f7b 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -256,6 +256,7 @@ { struct list_head *e = v; + ++*pos; e = e->next; if (e == &ip_conntrack_expect_list)