Merge branch 'stable/for-jens-3.14' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / net / x25 / x25_subr.c

diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index 5170d52bfd96e1e045422ae8e3cb607af2d2f843..6b5af65f491fb2e6112a0d0f1b510308e1b28c51 100644 (file)
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -23,6 +23,8 @@
  *                                             restriction on response.
  */
 
+#define pr_fmt(fmt) "X25: " fmt
+
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -148,7 +150,7 @@ void x25_write_internal(struct sock *sk, int frametype)
        case X25_RESET_CONFIRMATION:
                break;
        default:
-               printk(KERN_ERR "X.25: invalid frame type %02X\n", frametype);
+               pr_err("invalid frame type %02X\n", frametype);
                return;
        }
 
@@ -338,7 +340,7 @@ int x25_decode(struct sock *sk, struct sk_buff *skb, int *ns, int *nr, int *q,
                }
        }
 
-       printk(KERN_DEBUG "X.25: invalid PLP frame %02X %02X %02X\n",
+       pr_debug("invalid PLP frame %02X %02X %02X\n",
               frame[0], frame[1], frame[2]);
 
        return X25_ILLEGAL;