Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 628c70da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents cbd83da8 a96aca88

net/ipv4/netfilter/ip_conntrack_standalone.c

+1 −0
Original line number Diff line number Diff line
@@ -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)