lkml.org 
[lkml]   [2004]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] Another ip_conntrack seq fix: ip_conntrack_expect
From
Date
Name: Fix /proc/net/ip_conntrack_expect output
Status: Tested under nfsum on 2.6.9-rc1-bk16
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Depends: Netfilter/conntrack-seq-fix.patch.gz

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

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
--- .19747-linux-2.6.9-rc2-bk4/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-09-16 00:17:16.000000000 +1000
+++ .19747-linux-2.6.9-rc2-bk4.updated/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-09-20 06:03:50.000000000 +1000
@@ -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 = {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:06    [W:0.071 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site