diff options
Diffstat (limited to 'net/ipv4/xfrm4_tunnel.c')
-rw-r--r-- | net/ipv4/xfrm4_tunnel.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c index 9247d9d70e9d..5b48f49df0ba 100644 --- a/net/ipv4/xfrm4_tunnel.c +++ b/net/ipv4/xfrm4_tunnel.c | |||
@@ -75,18 +75,18 @@ static struct xfrm_tunnel xfrm64_tunnel_handler __read_mostly = { | |||
75 | static int __init ipip_init(void) | 75 | static int __init ipip_init(void) |
76 | { | 76 | { |
77 | if (xfrm_register_type(&ipip_type, AF_INET) < 0) { | 77 | if (xfrm_register_type(&ipip_type, AF_INET) < 0) { |
78 | printk(KERN_INFO "ipip init: can't add xfrm type\n"); | 78 | pr_info("%s: can't add xfrm type\n", __func__); |
79 | return -EAGAIN; | 79 | return -EAGAIN; |
80 | } | 80 | } |
81 | 81 | ||
82 | if (xfrm4_tunnel_register(&xfrm_tunnel_handler, AF_INET)) { | 82 | if (xfrm4_tunnel_register(&xfrm_tunnel_handler, AF_INET)) { |
83 | printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET\n"); | 83 | pr_info("%s: can't add xfrm handler for AF_INET\n", __func__); |
84 | xfrm_unregister_type(&ipip_type, AF_INET); | 84 | xfrm_unregister_type(&ipip_type, AF_INET); |
85 | return -EAGAIN; | 85 | return -EAGAIN; |
86 | } | 86 | } |
87 | #if IS_ENABLED(CONFIG_IPV6) | 87 | #if IS_ENABLED(CONFIG_IPV6) |
88 | if (xfrm4_tunnel_register(&xfrm64_tunnel_handler, AF_INET6)) { | 88 | if (xfrm4_tunnel_register(&xfrm64_tunnel_handler, AF_INET6)) { |
89 | printk(KERN_INFO "ipip init: can't add xfrm handler for AF_INET6\n"); | 89 | pr_info("%s: can't add xfrm handler for AF_INET6\n", __func__); |
90 | xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET); | 90 | xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET); |
91 | xfrm_unregister_type(&ipip_type, AF_INET); | 91 | xfrm_unregister_type(&ipip_type, AF_INET); |
92 | return -EAGAIN; | 92 | return -EAGAIN; |
@@ -99,12 +99,14 @@ static void __exit ipip_fini(void) | |||
99 | { | 99 | { |
100 | #if IS_ENABLED(CONFIG_IPV6) | 100 | #if IS_ENABLED(CONFIG_IPV6) |
101 | if (xfrm4_tunnel_deregister(&xfrm64_tunnel_handler, AF_INET6)) | 101 | if (xfrm4_tunnel_deregister(&xfrm64_tunnel_handler, AF_INET6)) |
102 | printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET6\n"); | 102 | pr_info("%s: can't remove xfrm handler for AF_INET6\n", |
103 | __func__); | ||
103 | #endif | 104 | #endif |
104 | if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET)) | 105 | if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET)) |
105 | printk(KERN_INFO "ipip close: can't remove xfrm handler for AF_INET\n"); | 106 | pr_info("%s: can't remove xfrm handler for AF_INET\n", |
107 | __func__); | ||
106 | if (xfrm_unregister_type(&ipip_type, AF_INET) < 0) | 108 | if (xfrm_unregister_type(&ipip_type, AF_INET) < 0) |
107 | printk(KERN_INFO "ipip close: can't remove xfrm type\n"); | 109 | pr_info("%s: can't remove xfrm type\n", __func__); |
108 | } | 110 | } |
109 | 111 | ||
110 | module_init(ipip_init); | 112 | module_init(ipip_init); |