Another ip_conntrack seq fix: ip_conntrack_expect

PATCH New Rusty Russell (IBM) 1 participant 1 message Sep 20, 2004

Subsystems (2)

Networking netfilter

lore

Share & tools

lore

Rusty Russell (IBM)

author

2004-09-20 22:26 UTC #0 lore raw

PATCH 1/1 Another ip_conntrack seq fix: ip_conntrack_expect

Name: Fix /proc/net/ip_conntrack_expect output
Status: Tested under nfsum on 2.6.9-rc1-bk16

Signed-off-by Rusty Russell <[email protected]>

Depends: Netfilter/conntrack-seq-fix.patch.gz

/proc/net/ip_conntrack_expect was changed over to seq_file, but a \n is missing.

net/ipv4/netfilter/ip_conntrack_standalone.c +3 -2

diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .19747-linux-2.6.9-rc2-bk4/net/ipv4/netfilter/ip_conntrack_standalone.c .19747-linux-2.6.9-rc2-bk4.updated/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -241,8 +241,9 @@ static int exp_seq_show(struct seq_file 
 	seq_printf(s, "use=%u proto=%u ", atomic_read(&expect->use),
 		   expect->tuple.dst.protonum);
 
-	return print_tuple(s, &expect->tuple,
-			   __ip_ct_find_proto(expect->tuple.dst.protonum));
+	print_tuple(s, &expect->tuple,
+		    __ip_ct_find_proto(expect->tuple.dst.protonum));
+	return seq_putc(s, '\n');
 }
 
 static struct seq_operations exp_seq_ops = {