diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 13:49:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 13:49:05 -0800 |
| commit | 8b6f92b1bd187b4f57296e5cf2e43ba883dd1968 (patch) | |
| tree | c40dd93f36c1859c3cf610f1f6065ce75aedb1c0 /net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | |
| parent | 467388f29fc9cebfb70e7a187107b6b5d772cb44 (diff) | |
| parent | 325fb5b4d26038cba665dd0d8ee09555321061f0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index c323643ffcf..72dbb6d1a6b 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; } |