aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-03-11 14:36:11 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-12 02:42:51 -0400
commit058bd4d2a4ff0aaa4a5381c67e776729d840c785 (patch)
tree4d1ea864a8740676c7e7c5a03cdaa67fc5f29418 /net/ipv4/ip_gre.c
parent43db362d3adda9e0a915ddb9a8d1a41186e19179 (diff)
net: Convert printks to pr_<level>
Use a more current kernel messaging style. Convert a printk block to print_hex_dump. Coalesce formats, align arguments. Use %s, __func__ instead of embedding function names. Some messages that were prefixed with <foo>_close are now prefixed with <foo>_fini. Some ah4 and esp messages are now not prefixed with "ip ". The intent of this patch is to later add something like #define pr_fmt(fmt) "IPv4: " fmt. to standardize the output messages. Text size is trivially reduced. (x86-32 allyesconfig) $ size net/ipv4/built-in.o* text data bss dec hex filename 887888 31558 249696 1169142 11d6f6 net/ipv4/built-in.o.new 887934 31558 249800 1169292 11d78c net/ipv4/built-in.o.old Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r--net/ipv4/ip_gre.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 6ef66af12291..185e0a75ecec 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1716,7 +1716,7 @@ static int __init ipgre_init(void)
1716{ 1716{
1717 int err; 1717 int err;
1718 1718
1719 printk(KERN_INFO "GRE over IPv4 tunneling driver\n"); 1719 pr_info("GRE over IPv4 tunneling driver\n");
1720 1720
1721 err = register_pernet_device(&ipgre_net_ops); 1721 err = register_pernet_device(&ipgre_net_ops);
1722 if (err < 0) 1722 if (err < 0)
@@ -1724,7 +1724,7 @@ static int __init ipgre_init(void)
1724 1724
1725 err = gre_add_protocol(&ipgre_protocol, GREPROTO_CISCO); 1725 err = gre_add_protocol(&ipgre_protocol, GREPROTO_CISCO);
1726 if (err < 0) { 1726 if (err < 0) {
1727 printk(KERN_INFO "ipgre init: can't add protocol\n"); 1727 pr_info("%s: can't add protocol\n", __func__);
1728 goto add_proto_failed; 1728 goto add_proto_failed;
1729 } 1729 }
1730 1730
@@ -1753,7 +1753,7 @@ static void __exit ipgre_fini(void)
1753 rtnl_link_unregister(&ipgre_tap_ops); 1753 rtnl_link_unregister(&ipgre_tap_ops);
1754 rtnl_link_unregister(&ipgre_link_ops); 1754 rtnl_link_unregister(&ipgre_link_ops);
1755 if (gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO) < 0) 1755 if (gre_del_protocol(&ipgre_protocol, GREPROTO_CISCO) < 0)
1756 printk(KERN_INFO "ipgre close: can't remove protocol\n"); 1756 pr_info("%s: can't remove protocol\n", __func__);
1757 unregister_pernet_device(&ipgre_net_ops); 1757 unregister_pernet_device(&ipgre_net_ops);
1758} 1758}
1759 1759