From: "Rusty Russell (IBM)" <rusty@au1.ibm.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: netfilter-devel@lists.netfilter.org,
"David S. Miller" <davem@davemloft.net>,
lkml - Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] Another ip_conntrack seq fix: ip_conntrack_expect
Date: Tue, 21 Sep 2004 08:26:31 +1000 [thread overview]
Message-ID: <1095719191.1940.86.camel@bach> (raw)
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 = {
reply other threads:[~2004-09-20 22:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1095719191.1940.86.camel@bach \
--to=rusty@au1.ibm.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netfilter-devel@lists.netfilter.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox