1 files changed, 17 insertions, 12 deletions

diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c
index 9d0a426eccb..43a2a7fb327 100644
--- a/net/lapb/lapb_subr.c
+++ b/net/lapb/lapb_subr.c
@@ -13,8 +13,6 @@
  *      LAPB 001        Jonathan Naylor Started Coding
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -29,6 +27,7 @@
 #include <linux/slab.h>
 #include <net/sock.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -113,9 +112,11 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         frame->type = LAPB_ILLEGAL;
 
-        lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n",
-                 lapb->dev, lapb->state,
-                 skb->data[0], skb->data[1], skb->data[2]);
+#if LAPB_DEBUG > 2
+        printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n",
+               lapb->dev, lapb->state,
+               skb->data[0], skb->data[1], skb->data[2]);
+#endif
 
         /* We always need to look at 2 bytes, sometimes we need
          * to look at 3 and those cases are handled below.
@@ -284,10 +285,12 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
                 dptr++;
                 *dptr++ = lapb->frmr_type;
 
-                lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
-                         lapb->dev, lapb->state,
-                         skb->data[1], skb->data[2], skb->data[3],
-                         skb->data[4], skb->data[5]);
+#if LAPB_DEBUG > 1
+        printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
+               lapb->dev, lapb->state,
+               skb->data[1], skb->data[2], skb->data[3],
+               skb->data[4], skb->data[5]);
+#endif
         } else {
                 dptr    = skb_put(skb, 4);
                 *dptr++ = LAPB_FRMR;
@@ -299,9 +302,11 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
                 dptr++;
                 *dptr++ = lapb->frmr_type;
 
-                lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n",
-                         lapb->dev, lapb->state, skb->data[1],
-                         skb->data[2], skb->data[3]);
+#if LAPB_DEBUG > 1
+        printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n",
+               lapb->dev, lapb->state, skb->data[1],
+               skb->data[2], skb->data[3]);
+#endif
         }
 
         lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE);