diff options
Diffstat (limited to 'net/ipv4/xfrm4_tunnel.c')
-rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 9247d9d70e9..05a5df2febc 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c | |||
@@ -3,6 +3,8 @@ | |||
3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) | 3 | * Copyright (C) 2003 David S. Miller (davem@redhat.com) |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #define pr_fmt(fmt) "IPsec: " fmt | ||
7 | |||
6 | #include <linux/skbuff.h> | 8 | #include <linux/skbuff.h> |
7 | #include <linux/module.h> | 9 | #include <linux/module.h> |
8 | #include <linux/mutex.h> | 10 | #include <linux/mutex.h> |
@@ -75,18 +77,18 @@ static struct xfrm_tunnel xfrm64_tunnel_handler __read_mostly = { | |||
75 | static int __init ipip_init(void) | 77 | static int __init ipip_init(void) |
76 | { | 78 | { |
77 | if (xfrm_register_type(&ipip_type, AF_INET) < 0) { | 79 | if (xfrm_register_type(&ipip_type, AF_INET) < 0) { |
78 | printk(KERN_INFO "ipip init: can't add xfrm type\n"); | 80 | pr_info("%s: can't add xfrm type\n", __func__); |
79 | return -EAGAIN; | 81 | return -EAGAIN; |
80 | } | 82 | } |
81 | 83 | ||
82 | if (xfrm4_tunnel_register(&xfrm_tunnel_handler, AF_INET)) { | 84 | if (xfrm4_tunnel_register(&xfrm_tunnel_handler, AF_INET)) { |
83 | printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET\n"); | 85 | pr_info("%s: can't add xfrm handler for AF_INET\n", __func__); |
84 | xfrm_unregister_type(&ipip_type, AF_INET); | 86 | xfrm_unregister_type(&ipip_type, AF_INET); |
85 | return -EAGAIN; | 87 | return -EAGAIN; |
86 | } | 88 | } |
87 | #if IS_ENABLED(CONFIG_IPV6) | 89 | #if IS_ENABLED(CONFIG_IPV6) |
88 | if (xfrm4_tunnel_register(&xfrm64_tunnel_handler, AF_INET6)) { | 90 | if (xfrm4_tunnel_register(&xfrm64_tunnel_handler, AF_INET6)) { |
89 | printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET6\n"); | 91 | pr_info("%s: can't add xfrm handler for AF_INET6\n", __func__); |
90 | xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET); | 92 | xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET); |
91 | xfrm_unregister_type(&ipip_type, AF_INET); | 93 | xfrm_unregister_type(&ipip_type, AF_INET); |
92 | return -EAGAIN; | 94 | return -EAGAIN; |
@@ -99,12 +101,14 @@ static void __exit ipip_fini(void) | |||
99 | { | 101 | { |
100 | #if IS_ENABLED(CONFIG_IPV6) | 102 | #if IS_ENABLED(CONFIG_IPV6) |
101 | if (xfrm4_tunnel_deregister(&xfrm64_tunnel_handler, AF_INET6)) | 103 | if (xfrm4_tunnel_deregister(&xfrm64_tunnel_handler, AF_INET6)) |
102 | printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET6\n"); | 104 | pr_info("%s: can't remove xfrm handler for AF_INET6\n", |
105 | __func__); | ||
103 | #endif | 106 | #endif |
104 | if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET)) | 107 | if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET)) |
105 | printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET\n"); | 108 | pr_info("%s: can't remove xfrm handler for AF_INET\n", |
109 | __func__); | ||
106 | if (xfrm_unregister_type(&ipip_type, AF_INET) < 0) | 110 | if (xfrm_unregister_type(&ipip_type, AF_INET) < 0) |
107 | printk(KERN_INFO "ipip close: can't remove xfrm type\n"); | 111 | pr_info("%s: can't remove xfrm type\n", __func__); |
108 | } | 112 | } |
109 | 113 | ||
110 | module_init(ipip_init); | 114 | module_init(ipip_init); |