diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /net/lapb/lapb_subr.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'net/lapb/lapb_subr.c')
-rw-r--r-- | net/lapb/lapb_subr.c | 29 |
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 @@ | |||
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 | |||
18 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
19 | #include <linux/types.h> | 17 | #include <linux/types.h> |
20 | #include <linux/socket.h> | 18 | #include <linux/socket.h> |
@@ -29,6 +27,7 @@ | |||
29 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
30 | #include <net/sock.h> | 28 | #include <net/sock.h> |
31 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
30 | #include <asm/system.h> | ||
32 | #include <linux/fcntl.h> | 31 | #include <linux/fcntl.h> |
33 | #include <linux/mm.h> | 32 | #include <linux/mm.h> |
34 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
@@ -113,9 +112,11 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, | |||
113 | { | 112 | { |
114 | frame->type = LAPB_ILLEGAL; | 113 | frame->type = LAPB_ILLEGAL; |
115 | 114 | ||
116 | lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n", | 115 | #if LAPB_DEBUG > 2 |
117 | lapb->dev, lapb->state, | 116 | printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n", |
118 | skb->data[0], skb->data[1], skb->data[2]); | 117 | lapb->dev, lapb->state, |
118 | skb->data[0], skb->data[1], skb->data[2]); | ||
119 | #endif | ||
119 | 120 | ||
120 | /* We always need to look at 2 bytes, sometimes we need | 121 | /* We always need to look at 2 bytes, sometimes we need |
121 | * to look at 3 and those cases are handled below. | 122 | * to look at 3 and those cases are handled below. |
@@ -284,10 +285,12 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) | |||
284 | dptr++; | 285 | dptr++; |
285 | *dptr++ = lapb->frmr_type; | 286 | *dptr++ = lapb->frmr_type; |
286 | 287 | ||
287 | lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", | 288 | #if LAPB_DEBUG > 1 |
288 | lapb->dev, lapb->state, | 289 | printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", |
289 | skb->data[1], skb->data[2], skb->data[3], | 290 | lapb->dev, lapb->state, |
290 | skb->data[4], skb->data[5]); | 291 | skb->data[1], skb->data[2], skb->data[3], |
292 | skb->data[4], skb->data[5]); | ||
293 | #endif | ||
291 | } else { | 294 | } else { |
292 | dptr = skb_put(skb, 4); | 295 | dptr = skb_put(skb, 4); |
293 | *dptr++ = LAPB_FRMR; | 296 | *dptr++ = LAPB_FRMR; |
@@ -299,9 +302,11 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) | |||
299 | dptr++; | 302 | dptr++; |
300 | *dptr++ = lapb->frmr_type; | 303 | *dptr++ = lapb->frmr_type; |
301 | 304 | ||
302 | lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n", | 305 | #if LAPB_DEBUG > 1 |
303 | lapb->dev, lapb->state, skb->data[1], | 306 | printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n", |
304 | skb->data[2], skb->data[3]); | 307 | lapb->dev, lapb->state, skb->data[1], |
308 | skb->data[2], skb->data[3]); | ||
309 | #endif | ||
305 | } | 310 | } |
306 | 311 | ||
307 | lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); | 312 | lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); |