From: Patrick McHardy <kaber@trash.net>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Patrick McHardy <kaber@trash.net>,
netfilter-devel@vger.kernel.org
Subject: netfilter 01/06: nf_conntrack_ipv6: fix nf_log_packet message in icmpv6 conntrack
Date: Tue, 24 Feb 2009 15:52:45 +0100 (MET) [thread overview]
Message-ID: <20090224145244.9789.94103.sendpatchset@x2.localnet> (raw)
In-Reply-To: <20090224145243.9789.60678.sendpatchset@x2.localnet>
commit 4aa3b2ee1945ed082430ae1fb988d60eef64ca07
Author: Eric Leblond <eric@inl.fr>
Date: Wed Feb 18 15:28:46 2009 +0100
netfilter: nf_conntrack_ipv6: fix nf_log_packet message in icmpv6 conntrack
This patch fixes a trivial typo that was adding a new line at end of
the nf_log_packet() prefix. It also make the logging conditionnal by
adding a LOG_INVALID test.
Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Patrick McHardy <kaber@trash.net>
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
index c323643..72dbb6d 100644
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -201,8 +201,9 @@ icmpv6_error(struct net *net, struct sk_buff *skb, unsigned int dataoff,
if (net->ct.sysctl_checksum && hooknum == NF_INET_PRE_ROUTING &&
nf_ip6_checksum(skb, hooknum, dataoff, IPPROTO_ICMPV6)) {
- nf_log_packet(PF_INET6, 0, skb, NULL, NULL, NULL,
- "nf_ct_icmpv6: ICMPv6 checksum failed\n");
+ if (LOG_INVALID(net, IPPROTO_ICMPV6))
+ nf_log_packet(PF_INET6, 0, skb, NULL, NULL, NULL,
+ "nf_ct_icmpv6: ICMPv6 checksum failed ");
return -NF_ACCEPT;
}
next prev parent reply other threads:[~2009-02-24 14:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-24 14:52 netfilter 00/06: netfilter fixes Patrick McHardy
2009-02-24 14:52 ` Patrick McHardy [this message]
2009-02-24 14:52 ` netfilter 02/06: nfnetlink_log: fix per-rule qthreshold override Patrick McHardy
2009-02-24 14:52 ` netfilter 03/06: nfnetlink_log: fix timeout handling Patrick McHardy
2009-02-24 14:52 ` netfilter 04/06: nf_conntrack: don't try to deliver events for untracked connections Patrick McHardy
2009-02-24 14:52 ` netfilter 05/06: make proc/net/ip* print names from foreign NFPROTO Patrick McHardy
2009-02-24 14:52 ` netfilter 06/06: xt_recent: fix proc-file addition/removal of IPv4 addresses Patrick McHardy
2009-02-24 21:50 ` netfilter 00/06: netfilter fixes David Miller
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=20090224145244.9789.94103.sendpatchset@x2.localnet \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).