diff options
author | Joe Perches <joe@perches.com> | 2006-01-13 17:29:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-01-13 17:29:07 -0500 |
commit | 46b86a2da0fd14bd49765330df63a62279833acb (patch) | |
tree | 069b4741a970db9b03772a870b4d63398b1f56e0 /net/ipv6/icmp.c | |
parent | 23b0ca5bf52cef0ab0f0fe247cb91cbef836e7eb (diff) |
[NET]: Use NIP6_FMT in kernel.h
There are errors and inconsistency in the display of NIP6 strings.
ie: net/ipv6/ip6_flowlabel.c
There are errors and inconsistency in the display of NIPQUAD strings too.
ie: net/netfilter/nf_conntrack_ftp.c
This patch:
adds NIP6_FMT to kernel.h
changes all code to use NIP6_FMT
fixes net/ipv6/ip6_flowlabel.c
adds NIPQUAD_FMT to kernel.h
fixes net/netfilter/nf_conntrack_ftp.c
changes a few uses of "%u.%u.%u.%u" to NIPQUAD_FMT for symmetry to NIP6_FMT
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r-- | net/ipv6/icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 53c81fcd20ba..fcf883183cef 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -607,7 +607,7 @@ static int icmpv6_rcv(struct sk_buff **pskb) | |||
607 | skb->csum = ~csum_ipv6_magic(saddr, daddr, skb->len, | 607 | skb->csum = ~csum_ipv6_magic(saddr, daddr, skb->len, |
608 | IPPROTO_ICMPV6, 0); | 608 | IPPROTO_ICMPV6, 0); |
609 | if (__skb_checksum_complete(skb)) { | 609 | if (__skb_checksum_complete(skb)) { |
610 | LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x > %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]\n", | 610 | LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [" NIP6_FMT " > " NIP6_FMT "]\n", |
611 | NIP6(*saddr), NIP6(*daddr)); | 611 | NIP6(*saddr), NIP6(*daddr)); |
612 | goto discard_it; | 612 | goto discard_it; |
613 | } | 613 | } |