diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-14 07:09:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-14 07:09:00 -0400 |
commit | a7d632b6b4ad1c92746ed409e41f9dc571ec04e2 (patch) | |
tree | 90e6aa51a9df50aa4a437749e89356ab15a0ff5f /net/ipv4/icmp.c | |
parent | 334f8b2afd9652e20f67ddee4fec483ed860425b (diff) |
[IPV4]: Use NIPQUAD_FMT to format ipv4 addresses.
And use %u to format port.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 3e14d9cd29b3..f064031f2031 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -685,7 +685,7 @@ static void icmp_unreach(struct sk_buff *skb) | |||
685 | break; | 685 | break; |
686 | case ICMP_FRAG_NEEDED: | 686 | case ICMP_FRAG_NEEDED: |
687 | if (ipv4_config.no_pmtu_disc) { | 687 | if (ipv4_config.no_pmtu_disc) { |
688 | LIMIT_NETDEBUG(KERN_INFO "ICMP: %u.%u.%u.%u: " | 688 | LIMIT_NETDEBUG(KERN_INFO "ICMP: " NIPQUAD_FMT ": " |
689 | "fragmentation needed " | 689 | "fragmentation needed " |
690 | "and DF set.\n", | 690 | "and DF set.\n", |
691 | NIPQUAD(iph->daddr)); | 691 | NIPQUAD(iph->daddr)); |
@@ -697,7 +697,7 @@ static void icmp_unreach(struct sk_buff *skb) | |||
697 | } | 697 | } |
698 | break; | 698 | break; |
699 | case ICMP_SR_FAILED: | 699 | case ICMP_SR_FAILED: |
700 | LIMIT_NETDEBUG(KERN_INFO "ICMP: %u.%u.%u.%u: Source " | 700 | LIMIT_NETDEBUG(KERN_INFO "ICMP: " NIPQUAD_FMT ": Source " |
701 | "Route Failed.\n", | 701 | "Route Failed.\n", |
702 | NIPQUAD(iph->daddr)); | 702 | NIPQUAD(iph->daddr)); |
703 | break; | 703 | break; |
@@ -730,9 +730,9 @@ static void icmp_unreach(struct sk_buff *skb) | |||
730 | if (!net->ipv4.sysctl_icmp_ignore_bogus_error_responses && | 730 | if (!net->ipv4.sysctl_icmp_ignore_bogus_error_responses && |
731 | inet_addr_type(net, iph->daddr) == RTN_BROADCAST) { | 731 | inet_addr_type(net, iph->daddr) == RTN_BROADCAST) { |
732 | if (net_ratelimit()) | 732 | if (net_ratelimit()) |
733 | printk(KERN_WARNING "%u.%u.%u.%u sent an invalid ICMP " | 733 | printk(KERN_WARNING NIPQUAD_FMT " sent an invalid ICMP " |
734 | "type %u, code %u " | 734 | "type %u, code %u " |
735 | "error to a broadcast: %u.%u.%u.%u on %s\n", | 735 | "error to a broadcast: " NIPQUAD_FMT " on %s\n", |
736 | NIPQUAD(ip_hdr(skb)->saddr), | 736 | NIPQUAD(ip_hdr(skb)->saddr), |
737 | icmph->type, icmph->code, | 737 | icmph->type, icmph->code, |
738 | NIPQUAD(iph->daddr), | 738 | NIPQUAD(iph->daddr), |
@@ -953,8 +953,8 @@ static void icmp_address_reply(struct sk_buff *skb) | |||
953 | break; | 953 | break; |
954 | } | 954 | } |
955 | if (!ifa && net_ratelimit()) { | 955 | if (!ifa && net_ratelimit()) { |
956 | printk(KERN_INFO "Wrong address mask %u.%u.%u.%u from " | 956 | printk(KERN_INFO "Wrong address mask " NIPQUAD_FMT " from " |
957 | "%s/%u.%u.%u.%u\n", | 957 | "%s/" NIPQUAD_FMT "\n", |
958 | NIPQUAD(*mp), dev->name, NIPQUAD(rt->rt_src)); | 958 | NIPQUAD(*mp), dev->name, NIPQUAD(rt->rt_src)); |
959 | } | 959 | } |
960 | } | 960 | } |