diff options
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r-- | net/ipv6/icmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index cc079d8d4681..23c56ce9e86b 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -29,6 +29,8 @@ | |||
29 | * Kazunori MIYAZAWA @USAGI: change output process to use ip6_append_data | 29 | * Kazunori MIYAZAWA @USAGI: change output process to use ip6_append_data |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #define pr_fmt(fmt) "IPv6: " fmt | ||
33 | |||
32 | #include <linux/module.h> | 34 | #include <linux/module.h> |
33 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
34 | #include <linux/types.h> | 36 | #include <linux/types.h> |
@@ -820,9 +822,7 @@ static int __net_init icmpv6_sk_init(struct net *net) | |||
820 | err = inet_ctl_sock_create(&sk, PF_INET6, | 822 | err = inet_ctl_sock_create(&sk, PF_INET6, |
821 | SOCK_RAW, IPPROTO_ICMPV6, net); | 823 | SOCK_RAW, IPPROTO_ICMPV6, net); |
822 | if (err < 0) { | 824 | if (err < 0) { |
823 | printk(KERN_ERR | 825 | pr_err("Failed to initialize the ICMP6 control socket (err %d)\n", |
824 | "Failed to initialize the ICMP6 control socket " | ||
825 | "(err %d).\n", | ||
826 | err); | 826 | err); |
827 | goto fail; | 827 | goto fail; |
828 | } | 828 | } |
@@ -881,7 +881,7 @@ int __init icmpv6_init(void) | |||
881 | return 0; | 881 | return 0; |
882 | 882 | ||
883 | fail: | 883 | fail: |
884 | printk(KERN_ERR "Failed to register ICMP6 protocol\n"); | 884 | pr_err("Failed to register ICMP6 protocol\n"); |
885 | unregister_pernet_subsys(&icmpv6_sk_ops); | 885 | unregister_pernet_subsys(&icmpv6_sk_ops); |
886 | return err; | 886 | return err; |
887 | } | 887 | } |