diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-25 03:02:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-25 03:02:05 -0500 |
| commit | f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f (patch) | |
| tree | 9edf1e86fbb91815f31d7728820d098041f03bb9 /net/ipv6 | |
| parent | 4545a3f2765bb7d2d93468a8ffa578ac87a2c5c7 (diff) | |
| parent | 0c9a3aaaf30e1d1994de58c554ef97a719e20892 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/orinoco.c
Diffstat (limited to 'net/ipv6')
| -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 c323643ffcf9..72dbb6d1a6b3 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, | |||
| 201 | 201 | ||
| 202 | if (net->ct.sysctl_checksum && hooknum == NF_INET_PRE_ROUTING && | 202 | if (net->ct.sysctl_checksum && hooknum == NF_INET_PRE_ROUTING && |
| 203 | nf_ip6_checksum(skb, hooknum, dataoff, IPPROTO_ICMPV6)) { | 203 | nf_ip6_checksum(skb, hooknum, dataoff, IPPROTO_ICMPV6)) { |
| 204 | nf_log_packet(PF_INET6, 0, skb, NULL, NULL, NULL, | 204 | if (LOG_INVALID(net, IPPROTO_ICMPV6)) |
| 205 | "nf_ct_icmpv6: ICMPv6 checksum failed\n"); | 205 | nf_log_packet(PF_INET6, 0, skb, NULL, NULL, NULL, |
| 206 | "nf_ct_icmpv6: ICMPv6 checksum failed "); | ||
| 206 | return -NF_ACCEPT; | 207 | return -NF_ACCEPT; |
| 207 | } | 208 | } |
| 208 | 209 | ||