diff options
Diffstat (limited to 'net/ipv6/ipcomp6.c')
-rw-r--r-- | net/ipv6/ipcomp6.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index bba658d9a03c..1addba5b8b39 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
@@ -30,6 +30,9 @@ | |||
30 | * The decompression of IP datagram MUST be done after the reassembly, | 30 | * The decompression of IP datagram MUST be done after the reassembly, |
31 | * AH/ESP processing. | 31 | * AH/ESP processing. |
32 | */ | 32 | */ |
33 | |||
34 | #define pr_fmt(fmt) "IPv6: " fmt | ||
35 | |||
33 | #include <linux/module.h> | 36 | #include <linux/module.h> |
34 | #include <net/ip.h> | 37 | #include <net/ip.h> |
35 | #include <net/xfrm.h> | 38 | #include <net/xfrm.h> |
@@ -190,11 +193,11 @@ static const struct inet6_protocol ipcomp6_protocol = | |||
190 | static int __init ipcomp6_init(void) | 193 | static int __init ipcomp6_init(void) |
191 | { | 194 | { |
192 | if (xfrm_register_type(&ipcomp6_type, AF_INET6) < 0) { | 195 | if (xfrm_register_type(&ipcomp6_type, AF_INET6) < 0) { |
193 | printk(KERN_INFO "ipcomp6 init: can't add xfrm type\n"); | 196 | pr_info("%s: can't add xfrm type\n", __func__); |
194 | return -EAGAIN; | 197 | return -EAGAIN; |
195 | } | 198 | } |
196 | if (inet6_add_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) { | 199 | if (inet6_add_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) { |
197 | printk(KERN_INFO "ipcomp6 init: can't add protocol\n"); | 200 | pr_info("%s: can't add protocol\n", __func__); |
198 | xfrm_unregister_type(&ipcomp6_type, AF_INET6); | 201 | xfrm_unregister_type(&ipcomp6_type, AF_INET6); |
199 | return -EAGAIN; | 202 | return -EAGAIN; |
200 | } | 203 | } |
@@ -204,9 +207,9 @@ static int __init ipcomp6_init(void) | |||
204 | static void __exit ipcomp6_fini(void) | 207 | static void __exit ipcomp6_fini(void) |
205 | { | 208 | { |
206 | if (inet6_del_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) | 209 | if (inet6_del_protocol(&ipcomp6_protocol, IPPROTO_COMP) < 0) |
207 | printk(KERN_INFO "ipv6 ipcomp close: can't remove protocol\n"); | 210 | pr_info("%s: can't remove protocol\n", __func__); |
208 | if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0) | 211 | if (xfrm_unregister_type(&ipcomp6_type, AF_INET6) < 0) |
209 | printk(KERN_INFO "ipv6 ipcomp close: can't remove xfrm type\n"); | 212 | pr_info("%s: can't remove xfrm type\n", __func__); |
210 | } | 213 | } |
211 | 214 | ||
212 | module_init(ipcomp6_init); | 215 | module_init(ipcomp6_init); |