diff options
Diffstat (limited to 'net/ipv6/tunnel6.c')
| -rw-r--r-- | net/ipv6/tunnel6.c | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c index 4f3cec12aa8..4b0f50d9a96 100644 --- a/net/ipv6/tunnel6.c +++ b/net/ipv6/tunnel6.c @@ -19,6 +19,8 @@   * 		YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>   */ +#define pr_fmt(fmt) "IPv6: " fmt +  #include <linux/icmpv6.h>  #include <linux/init.h>  #include <linux/module.h> @@ -160,11 +162,11 @@ static const struct inet6_protocol tunnel46_protocol = {  static int __init tunnel6_init(void)  {  	if (inet6_add_protocol(&tunnel6_protocol, IPPROTO_IPV6)) { -		printk(KERN_ERR "tunnel6 init(): can't add protocol\n"); +		pr_err("%s: can't add protocol\n", __func__);  		return -EAGAIN;  	}  	if (inet6_add_protocol(&tunnel46_protocol, IPPROTO_IPIP)) { -		printk(KERN_ERR "tunnel6 init(): can't add protocol\n"); +		pr_err("%s: can't add protocol\n", __func__);  		inet6_del_protocol(&tunnel6_protocol, IPPROTO_IPV6);  		return -EAGAIN;  	} @@ -174,9 +176,9 @@ static int __init tunnel6_init(void)  static void __exit tunnel6_fini(void)  {  	if (inet6_del_protocol(&tunnel46_protocol, IPPROTO_IPIP)) -		printk(KERN_ERR "tunnel6 close: can't remove protocol\n"); +		pr_err("%s: can't remove protocol\n", __func__);  	if (inet6_del_protocol(&tunnel6_protocol, IPPROTO_IPV6)) -		printk(KERN_ERR "tunnel6 close: can't remove protocol\n"); +		pr_err("%s: can't remove protocol\n", __func__);  }  module_init(tunnel6_init);  |