Skip to content

L
linux
Commit a508da6c authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files
Options

lapb: Neaten debugging 

Enable dynamic debugging and remove a bunch of #ifdef/#endifs.

Add a lapb_dbg(level, fmt, ...) macro and replace the
printk(KERN_DEBUG uses.
Add pr_fmt and remove embedded prefixes.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5e371f6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 306 deletions
include/net/lapb.h
View file @ a508da6c
...@@ -149,4 +149,10 @@ extern int lapb_t1timer_running(struct lapb_cb *lapb); ...@@ -149,4 +149,10 @@ extern int lapb_t1timer_running(struct lapb_cb *lapb);
*/ */
#define LAPB_DEBUG 0 #define LAPB_DEBUG 0
#define lapb_dbg(level, fmt, ...) \
do { \
if (level < LAPB_DEBUG) \
pr_debug(fmt, ##__VA_ARGS__); \
} while (0)
#endif #endif
net/lapb/lapb_iface.c
View file @ a508da6c
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
* 2000-10-29 Henner Eisen lapb_data_indication() return status. * 2000-10-29 Henner Eisen lapb_data_indication() return status.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -279,9 +281,7 @@ int lapb_connect_request(struct net_device *dev) ...@@ -279,9 +281,7 @@ int lapb_connect_request(struct net_device *dev)
lapb_establish_data_link(lapb); lapb_establish_data_link(lapb);
#if LAPB_DEBUG > 0 lapb_dbg(0, "(%p) S0 -> S1\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S0 -> S1\n", lapb->dev);
#endif
lapb->state = LAPB_STATE_1; lapb->state = LAPB_STATE_1;
rc = LAPB_OK; rc = LAPB_OK;
...@@ -305,12 +305,8 @@ int lapb_disconnect_request(struct net_device *dev) ...@@ -305,12 +305,8 @@ int lapb_disconnect_request(struct net_device *dev)
goto out_put; goto out_put;
case LAPB_STATE_1: case LAPB_STATE_1:
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S1 TX DISC(1)\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev); lapb_dbg(0, "(%p) S1 -> S0\n", lapb->dev);
#endif
#if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb); lapb_start_t1timer(lapb);
...@@ -329,12 +325,8 @@ int lapb_disconnect_request(struct net_device *dev) ...@@ -329,12 +325,8 @@ int lapb_disconnect_request(struct net_device *dev)
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb->state = LAPB_STATE_2; lapb->state = LAPB_STATE_2;
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S3 DISC(1)\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S3 DISC(1)\n", lapb->dev); lapb_dbg(0, "(%p) S3 -> S2\n", lapb->dev);
#endif
#if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S2\n", lapb->dev);
#endif
rc = LAPB_OK; rc = LAPB_OK;
out_put: out_put:
......
net/lapb/lapb_in.c
View file @ a508da6c
This diff is collapsed.
net/lapb/lapb_out.c
View file @ a508da6c
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* LAPB 002 Jonathan Naylor New timer architecture. * LAPB 002 Jonathan Naylor New timer architecture.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h> #include <linux/socket.h>
...@@ -60,10 +62,8 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll ...@@ -60,10 +62,8 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll
*frame |= lapb->vs << 1; *frame |= lapb->vs << 1;
} }
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX I(%d) S%d R%d\n",
printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n", lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr);
lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr);
#endif
lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); lapb_transmit_buffer(lapb, skb, LAPB_COMMAND);
} }
...@@ -148,11 +148,9 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type) ...@@ -148,11 +148,9 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type)
} }
} }
#if LAPB_DEBUG > 2 lapb_dbg(2, "(%p) S%d TX %02X %02X %02X\n",
printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n", lapb->dev, lapb->state,
lapb->dev, lapb->state, skb->data[0], skb->data[1], skb->data[2]);
skb->data[0], skb->data[1], skb->data[2]);
#endif
if (!lapb_data_transmit(lapb, skb)) if (!lapb_data_transmit(lapb, skb))
kfree_skb(skb); kfree_skb(skb);
...@@ -164,16 +162,10 @@ void lapb_establish_data_link(struct lapb_cb *lapb) ...@@ -164,16 +162,10 @@ void lapb_establish_data_link(struct lapb_cb *lapb)
lapb->n2count = 0; lapb->n2count = 0;
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX SABME(1)\n", lapb->dev, lapb->state);
printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n",
lapb->dev, lapb->state);
#endif
lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
} else { } else {
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX SABM(1)\n", lapb->dev, lapb->state);
printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n",
lapb->dev, lapb->state);
#endif
lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
} }
...@@ -183,10 +175,8 @@ void lapb_establish_data_link(struct lapb_cb *lapb) ...@@ -183,10 +175,8 @@ void lapb_establish_data_link(struct lapb_cb *lapb)
void lapb_enquiry_response(struct lapb_cb *lapb) void lapb_enquiry_response(struct lapb_cb *lapb)
{ {
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX RR(1) R%d\n",
printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n", lapb->dev, lapb->state, lapb->vr);
lapb->dev, lapb->state, lapb->vr);
#endif
lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE); lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE);
...@@ -195,10 +185,8 @@ void lapb_enquiry_response(struct lapb_cb *lapb) ...@@ -195,10 +185,8 @@ void lapb_enquiry_response(struct lapb_cb *lapb)
void lapb_timeout_response(struct lapb_cb *lapb) void lapb_timeout_response(struct lapb_cb *lapb)
{ {
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX RR(0) R%d\n",
printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n", lapb->dev, lapb->state, lapb->vr);
lapb->dev, lapb->state, lapb->vr);
#endif
lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE); lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE);
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION; lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
......
net/lapb/lapb_subr.c
View file @ a508da6c
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
* LAPB 001 Jonathan Naylor Started Coding * LAPB 001 Jonathan Naylor Started Coding
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h> #include <linux/socket.h>
...@@ -111,11 +113,9 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -111,11 +113,9 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
{ {
frame->type = LAPB_ILLEGAL; frame->type = LAPB_ILLEGAL;
#if LAPB_DEBUG > 2 lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n",
printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n", lapb->dev, lapb->state,
lapb->dev, lapb->state, skb->data[0], skb->data[1], skb->data[2]);
skb->data[0], skb->data[1], skb->data[2]);
#endif
/* We always need to look at 2 bytes, sometimes we need /* We always need to look at 2 bytes, sometimes we need
* to look at 3 and those cases are handled below. * to look at 3 and those cases are handled below.
...@@ -284,12 +284,10 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) ...@@ -284,12 +284,10 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
dptr++; dptr++;
*dptr++ = lapb->frmr_type; *dptr++ = lapb->frmr_type;
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", lapb->dev, lapb->state,
lapb->dev, lapb->state, skb->data[1], skb->data[2], skb->data[3],
skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5]);
skb->data[4], skb->data[5]);
#endif
} else { } else {
dptr = skb_put(skb, 4); dptr = skb_put(skb, 4);
*dptr++ = LAPB_FRMR; *dptr++ = LAPB_FRMR;
...@@ -301,11 +299,9 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) ...@@ -301,11 +299,9 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
dptr++; dptr++;
*dptr++ = lapb->frmr_type; *dptr++ = lapb->frmr_type;
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n",
printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n", lapb->dev, lapb->state, skb->data[1],
lapb->dev, lapb->state, skb->data[1], skb->data[2], skb->data[3]);
skb->data[2], skb->data[3]);
#endif
} }
lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE);
......
net/lapb/lapb_timer.c
View file @ a508da6c
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* LAPB 002 Jonathan Naylor New timer architecture. * LAPB 002 Jonathan Naylor New timer architecture.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h> #include <linux/socket.h>
...@@ -105,21 +107,17 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -105,21 +107,17 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb_clear_queues(lapb); lapb_clear_queues(lapb);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 lapb_dbg(0, "(%p) S1 -> S0\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif
return; return;
} else { } else {
lapb->n2count++; lapb->n2count++;
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S1 TX SABME(1)\n",
printk(KERN_DEBUG "lapb: (%p) S1 TX SABME(1)\n", lapb->dev); lapb->dev);
#endif
lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
} else { } else {
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S1 TX SABM(1)\n",
printk(KERN_DEBUG "lapb: (%p) S1 TX SABM(1)\n", lapb->dev); lapb->dev);
#endif
lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
} }
} }
...@@ -133,15 +131,11 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -133,15 +131,11 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb_clear_queues(lapb); lapb_clear_queues(lapb);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT); lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
#endif
return; return;
} else { } else {
lapb->n2count++; lapb->n2count++;
#if LAPB_DEBUG > 1 lapb_dbg(1, "(%p) S2 TX DISC(1)\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S2 TX DISC(1)\n", lapb->dev);
#endif
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
} }
break; break;
...@@ -155,9 +149,7 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -155,9 +149,7 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
#endif
return; return;
} else { } else {
lapb->n2count++; lapb->n2count++;
...@@ -173,9 +165,7 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -173,9 +165,7 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb_clear_queues(lapb); lapb_clear_queues(lapb);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 lapb_dbg(0, "(%p) S4 -> S0\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S4 -> S0\n", lapb->dev);
#endif
return; return;
} else { } else {
lapb->n2count++; lapb->n2count++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7