Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

628c70da · Linus Torvalds · cbd83da8 · a96aca88 · 628c70da
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

net/ipv4/netfilter/ip_conntrack_standalone.c net/ipv4/netfilter/ip_conntrack_standalone.c +1 -0

未找到文件。
--- 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)