diff options
author | Joe Perches <joe@perches.com> | 2012-05-17 06:25:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-17 18:45:20 -0400 |
commit | a508da6cc0093171833efb8376b00473f24221b9 (patch) | |
tree | d2578008abfaf33a59da65a64b916c62ee79eedd /net/lapb/lapb_subr.c | |
parent | a5e371f61ad33c07b28e7c9b60c78d71fdd34e2a (diff) |
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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/lapb/lapb_subr.c')
-rw-r--r-- | net/lapb/lapb_subr.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c index 066225b4e824..9d0a426eccbb 100644 --- a/net/lapb/lapb_subr.c +++ b/net/lapb/lapb_subr.c | |||
@@ -13,6 +13,8 @@ | |||
13 | * LAPB 001 Jonathan Naylor Started Coding | 13 | * LAPB 001 Jonathan Naylor Started Coding |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
17 | |||
16 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
17 | #include <linux/types.h> | 19 | #include <linux/types.h> |
18 | #include <linux/socket.h> | 20 | #include <linux/socket.h> |
@@ -111,11 +113,9 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, | |||
111 | { | 113 | { |
112 | frame->type = LAPB_ILLEGAL; | 114 | frame->type = LAPB_ILLEGAL; |
113 | 115 | ||
114 | #if LAPB_DEBUG > 2 | 116 | lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n", |
115 | printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n", | 117 | lapb->dev, lapb->state, |
116 | lapb->dev, lapb->state, | 118 | skb->data[0], skb->data[1], skb->data[2]); |
117 | skb->data[0], skb->data[1], skb->data[2]); | ||
118 | #endif | ||
119 | 119 | ||
120 | /* We always need to look at 2 bytes, sometimes we need | 120 | /* We always need to look at 2 bytes, sometimes we need |
121 | * to look at 3 and those cases are handled below. | 121 | * to look at 3 and those cases are handled below. |
@@ -284,12 +284,10 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) | |||
284 | dptr++; | 284 | dptr++; |
285 | *dptr++ = lapb->frmr_type; | 285 | *dptr++ = lapb->frmr_type; |
286 | 286 | ||
287 | #if LAPB_DEBUG > 1 | 287 | lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", |
288 | printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", | 288 | lapb->dev, lapb->state, |
289 | lapb->dev, lapb->state, | 289 | skb->data[1], skb->data[2], skb->data[3], |
290 | skb->data[1], skb->data[2], skb->data[3], | 290 | skb->data[4], skb->data[5]); |
291 | skb->data[4], skb->data[5]); | ||
292 | #endif | ||
293 | } else { | 291 | } else { |
294 | dptr = skb_put(skb, 4); | 292 | dptr = skb_put(skb, 4); |
295 | *dptr++ = LAPB_FRMR; | 293 | *dptr++ = LAPB_FRMR; |
@@ -301,11 +299,9 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) | |||
301 | dptr++; | 299 | dptr++; |
302 | *dptr++ = lapb->frmr_type; | 300 | *dptr++ = lapb->frmr_type; |
303 | 301 | ||
304 | #if LAPB_DEBUG > 1 | 302 | lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n", |
305 | printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n", | 303 | lapb->dev, lapb->state, skb->data[1], |
306 | lapb->dev, lapb->state, skb->data[1], | 304 | skb->data[2], skb->data[3]); |
307 | skb->data[2], skb->data[3]); | ||
308 | #endif | ||
309 | } | 305 | } |
310 | 306 | ||
311 | lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); | 307 | lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); |