diff options
author | Joe Perches <joe@perches.com> | 2012-03-12 03:03:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-12 20:05:21 -0400 |
commit | afd465030acb4098abcb6b965a5aebc7ea2209e0 (patch) | |
tree | 59c93e8eda99cd59339dfbb77f1d2c4f79c634ee /net/ipv4/icmp.c | |
parent | 058bd4d2a4ff0aaa4a5381c67e776729d840c785 (diff) |
net: ipv4: Standardize prefixes for message logging
Add #define pr_fmt(fmt) as appropriate.
Add "IPv4: ", "TCP: ", and "IPsec: " to appropriate files.
Standardize on "UDPLite: " for appropriate uses.
Some prefixes were previously "UDPLITE: " and "UDP-Lite: ".
Add KBUILD_MODNAME ": " to icmp and gre.
Remove embedded prefixes as appropriate.
Add missing "\n" to pr_info in gre.c.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 5c7323b7810f..9664d353ccd8 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -62,6 +62,8 @@ | |||
62 | * | 62 | * |
63 | */ | 63 | */ |
64 | 64 | ||
65 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
66 | |||
65 | #include <linux/module.h> | 67 | #include <linux/module.h> |
66 | #include <linux/types.h> | 68 | #include <linux/types.h> |
67 | #include <linux/jiffies.h> | 69 | #include <linux/jiffies.h> |
@@ -670,7 +672,7 @@ static void icmp_unreach(struct sk_buff *skb) | |||
670 | break; | 672 | break; |
671 | case ICMP_FRAG_NEEDED: | 673 | case ICMP_FRAG_NEEDED: |
672 | if (ipv4_config.no_pmtu_disc) { | 674 | if (ipv4_config.no_pmtu_disc) { |
673 | LIMIT_NETDEBUG(KERN_INFO "ICMP: %pI4: fragmentation needed and DF set\n", | 675 | LIMIT_NETDEBUG(KERN_INFO pr_fmt("%pI4: fragmentation needed and DF set\n"), |
674 | &iph->daddr); | 676 | &iph->daddr); |
675 | } else { | 677 | } else { |
676 | info = ip_rt_frag_needed(net, iph, | 678 | info = ip_rt_frag_needed(net, iph, |
@@ -681,7 +683,7 @@ static void icmp_unreach(struct sk_buff *skb) | |||
681 | } | 683 | } |
682 | break; | 684 | break; |
683 | case ICMP_SR_FAILED: | 685 | case ICMP_SR_FAILED: |
684 | LIMIT_NETDEBUG(KERN_INFO "ICMP: %pI4: Source Route Failed\n", | 686 | LIMIT_NETDEBUG(KERN_INFO pr_fmt("%pI4: Source Route Failed\n"), |
685 | &iph->daddr); | 687 | &iph->daddr); |
686 | break; | 688 | break; |
687 | default: | 689 | default: |