Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / ah4.c

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 36d14406261e8c9ad486103127ae1106baca4678..fd508b526014209eba345ddb1605117a897afdf4 100644 (file)
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) "IPsec: " fmt
+
 #include <crypto/hash.h>
 #include <linux/err.h>
 #include <linux/module.h>
@@ -445,9 +447,10 @@ static int ah_init_state(struct xfrm_state *x)
 
        if (aalg_desc->uinfo.auth.icv_fullbits/8 !=
            crypto_ahash_digestsize(ahash)) {
-               printk(KERN_INFO "AH: %s digestsize %u != %hu\n",
-                      x->aalg->alg_name, crypto_ahash_digestsize(ahash),
-                      aalg_desc->uinfo.auth.icv_fullbits/8);
+               pr_info("%s: %s digestsize %u != %hu\n",
+                       __func__, x->aalg->alg_name,
+                       crypto_ahash_digestsize(ahash),
+                       aalg_desc->uinfo.auth.icv_fullbits / 8);
                goto error;
        }
 
@@ -510,11 +513,11 @@ static const struct net_protocol ah4_protocol = {
 static int __init ah4_init(void)
 {
        if (xfrm_register_type(&ah_type, AF_INET) < 0) {
-               printk(KERN_INFO "ip ah init: can't add xfrm type\n");
+               pr_info("%s: can't add xfrm type\n", __func__);
                return -EAGAIN;
        }
        if (inet_add_protocol(&ah4_protocol, IPPROTO_AH) < 0) {
-               printk(KERN_INFO "ip ah init: can't add protocol\n");
+               pr_info("%s: can't add protocol\n", __func__);
                xfrm_unregister_type(&ah_type, AF_INET);
                return -EAGAIN;
        }
@@ -524,9 +527,9 @@ static int __init ah4_init(void)
 static void __exit ah4_fini(void)
 {
        if (inet_del_protocol(&ah4_protocol, IPPROTO_AH) < 0)
-               printk(KERN_INFO "ip ah close: can't remove protocol\n");
+               pr_info("%s: can't remove protocol\n", __func__);
        if (xfrm_unregister_type(&ah_type, AF_INET) < 0)
-               printk(KERN_INFO "ip ah close: can't remove xfrm type\n");
+               pr_info("%s: can't remove xfrm type\n", __func__);
 }
 
 module_init(ah4_init);