1 files changed, 91 insertions, 230 deletions

diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c
index 2ec1af5c36cc..5dba899131b3 100644
--- a/net/lapb/lapb_in.c
+++ b/net/lapb/lapb_in.c
@@ -15,6 +15,8 @@
  *      2000-10-29      Henner Eisen    lapb_data_indication() return status.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -30,7 +32,6 @@
 #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>
@@ -45,25 +46,16 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S0 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S0 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -79,18 +71,11 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S0 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S0 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -103,22 +88,16 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->va        = 0;
                         lapb_connect_indication(lapb, LAPB_OK);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S0 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S0 TX UA(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
                 break;
 
@@ -138,68 +117,45 @@ static void lapb_state1_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S1 TX DM(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE);
                 break;
 
         case LAPB_UA:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX UA(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S1 -> S3\n", lapb->dev);
                         lapb_stop_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state     = LAPB_STATE_3;
@@ -213,14 +169,9 @@ static void lapb_state1_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_DM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX DM(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S1 -> S0\n", lapb->dev);
                         lapb_clear_queues(lapb);
                         lapb->state = LAPB_STATE_0;
                         lapb_start_t1timer(lapb);
@@ -243,34 +194,22 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
         switch (frame->type) {
         case LAPB_SABM:
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX {SABM,SABME}(%d)\n",
+                         lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S2 TX DM(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE);
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S2 TX UA(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
                 break;
 
         case LAPB_UA:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX UA(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
                         lapb->state = LAPB_STATE_0;
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
@@ -279,14 +218,9 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_DM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX DM(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
                         lapb->state = LAPB_STATE_0;
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
@@ -298,12 +232,9 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
         case LAPB_REJ:
         case LAPB_RNR:
         case LAPB_RR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n",
+                lapb_dbg(1, "(%p) S2 RX {I,REJ,RNR,RR}(%d)\n",
                        lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX DM(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf)
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
@@ -326,22 +257,15 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S3 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -356,15 +280,10 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S3 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -376,23 +295,16 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->va        = 0;
                         lapb_requeue_frames(lapb);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
-#endif
+                lapb_dbg(1, "(%p) S3 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
                 lapb_clear_queues(lapb);
                 lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
                 lapb_start_t1timer(lapb);
@@ -402,13 +314,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_DM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
-#endif
+                lapb_dbg(1, "(%p) S3 RX DM(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
                 lapb_clear_queues(lapb);
                 lapb->state = LAPB_STATE_0;
                 lapb_start_t1timer(lapb);
@@ -417,10 +324,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_RNR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n",
-                       lapb->dev, frame->pf, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX RNR(%d) R%d\n",
+                         lapb->dev, frame->pf, frame->nr);
                 lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION;
                 lapb_check_need_response(lapb, frame->cr, frame->pf);
                 if (lapb_validate_nr(lapb, frame->nr)) {
@@ -429,9 +334,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -440,10 +343,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_RR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n",
-                       lapb->dev, frame->pf, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX RR(%d) R%d\n",
+                         lapb->dev, frame->pf, frame->nr);
                 lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION;
                 lapb_check_need_response(lapb, frame->cr, frame->pf);
                 if (lapb_validate_nr(lapb, frame->nr)) {
@@ -452,9 +353,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -463,10 +362,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_REJ:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n",
-                       lapb->dev, frame->pf, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX REJ(%d) R%d\n",
+                         lapb->dev, frame->pf, frame->nr);
                 lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION;
                 lapb_check_need_response(lapb, frame->cr, frame->pf);
                 if (lapb_validate_nr(lapb, frame->nr)) {
@@ -478,9 +375,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -489,17 +384,13 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_I:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n",
-                       lapb->dev, frame->pf, frame->ns, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX I(%d) S%d R%d\n",
+                         lapb->dev, frame->pf, frame->ns, frame->nr);
                 if (!lapb_validate_nr(lapb, frame->nr)) {
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -523,7 +414,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                          * a frame lost on the wire.
                          */
                         if (cn == NET_RX_DROP) {
-                                printk(KERN_DEBUG "LAPB: rx congestion\n");
+                                pr_debug("rx congestion\n");
                                 break;
                         }
                         lapb->vr = (lapb->vr + 1) % modulus;
@@ -542,11 +433,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                                 if (frame->pf)
                                         lapb_enquiry_response(lapb);
                         } else {
-#if LAPB_DEBUG > 1
-                                printk(KERN_DEBUG
-                                       "lapb: (%p) S3 TX REJ(%d) R%d\n",
-                                       lapb->dev, frame->pf, lapb->vr);
-#endif
+                                lapb_dbg(1, "(%p) S3 TX REJ(%d) R%d\n",
+                                         lapb->dev, frame->pf, lapb->vr);
                                 lapb->condition |= LAPB_REJECT_CONDITION;
                                 lapb_send_control(lapb, LAPB_REJ, frame->pf,
                                                   LAPB_RESPONSE);
@@ -556,31 +444,22 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_FRMR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X "
-                       "%02X %02X %02X %02X\n", lapb->dev, frame->pf,
-                       skb->data[0], skb->data[1], skb->data[2],
-                       skb->data[3], skb->data[4]);
-#endif
+                lapb_dbg(1, "(%p) S3 RX FRMR(%d) %02X %02X %02X %02X %02X\n",
+                         lapb->dev, frame->pf,
+                         skb->data[0], skb->data[1], skb->data[2],
+                         skb->data[3], skb->data[4]);
                 lapb_establish_data_link(lapb);
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", lapb->dev);
-#endif
+                lapb_dbg(0, "(%p) S3 -> S1\n", lapb->dev);
                 lapb_requeue_frames(lapb);
                 lapb->state = LAPB_STATE_1;
                 break;
 
         case LAPB_ILLEGAL:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S3 RX ILLEGAL(%d)\n", lapb->dev, frame->pf);
                 lapb->frmr_data = *frame;
                 lapb->frmr_type = LAPB_FRMR_W;
                 lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                 lapb_start_t1timer(lapb);
                 lapb_stop_t2timer(lapb);
                 lapb->state   = LAPB_STATE_4;
@@ -601,25 +480,16 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S4 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S4 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -635,18 +505,11 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S4 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S4 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -659,10 +522,8 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->va        = 0;
                         lapb_connect_indication(lapb, LAPB_OK);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }