diff options
Diffstat (limited to 'net/lapb')
| -rw-r--r-- | net/lapb/lapb_in.c | 5 | ||||
| -rw-r--r-- | net/lapb/lapb_out.c | 4 | ||||
| -rw-r--r-- | net/lapb/lapb_subr.c | 14 |
3 files changed, 8 insertions, 15 deletions
diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c index 5dba899131b3..182470847fcf 100644 --- a/net/lapb/lapb_in.c +++ b/net/lapb/lapb_in.c | |||
| @@ -444,10 +444,9 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb, | |||
| 444 | break; | 444 | break; |
| 445 | 445 | ||
| 446 | case LAPB_FRMR: | 446 | case LAPB_FRMR: |
| 447 | lapb_dbg(1, "(%p) S3 RX FRMR(%d) %02X %02X %02X %02X %02X\n", | 447 | lapb_dbg(1, "(%p) S3 RX FRMR(%d) %5ph\n", |
| 448 | lapb->dev, frame->pf, | 448 | lapb->dev, frame->pf, |
| 449 | skb->data[0], skb->data[1], skb->data[2], | 449 | skb->data); |
| 450 | skb->data[3], skb->data[4]); | ||
| 451 | lapb_establish_data_link(lapb); | 450 | lapb_establish_data_link(lapb); |
| 452 | lapb_dbg(0, "(%p) S3 -> S1\n", lapb->dev); | 451 | lapb_dbg(0, "(%p) S3 -> S1\n", lapb->dev); |
| 453 | lapb_requeue_frames(lapb); | 452 | lapb_requeue_frames(lapb); |
diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c index ba4d015bd1a6..482c94d9d958 100644 --- a/net/lapb/lapb_out.c +++ b/net/lapb/lapb_out.c | |||
| @@ -148,9 +148,7 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type) | |||
| 148 | } | 148 | } |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | lapb_dbg(2, "(%p) S%d TX %02X %02X %02X\n", | 151 | lapb_dbg(2, "(%p) S%d TX %3ph\n", lapb->dev, lapb->state, skb->data); |
| 152 | lapb->dev, lapb->state, | ||
| 153 | skb->data[0], skb->data[1], skb->data[2]); | ||
| 154 | 152 | ||
| 155 | if (!lapb_data_transmit(lapb, skb)) | 153 | if (!lapb_data_transmit(lapb, skb)) |
| 156 | kfree_skb(skb); | 154 | kfree_skb(skb); |
diff --git a/net/lapb/lapb_subr.c b/net/lapb/lapb_subr.c index 9d0a426eccbb..3c1914df641f 100644 --- a/net/lapb/lapb_subr.c +++ b/net/lapb/lapb_subr.c | |||
| @@ -113,9 +113,7 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, | |||
| 113 | { | 113 | { |
| 114 | frame->type = LAPB_ILLEGAL; | 114 | frame->type = LAPB_ILLEGAL; |
| 115 | 115 | ||
| 116 | lapb_dbg(2, "(%p) S%d RX %02X %02X %02X\n", | 116 | lapb_dbg(2, "(%p) S%d RX %3ph\n", lapb->dev, lapb->state, skb->data); |
| 117 | lapb->dev, lapb->state, | ||
| 118 | skb->data[0], skb->data[1], skb->data[2]); | ||
| 119 | 117 | ||
| 120 | /* We always need to look at 2 bytes, sometimes we need | 118 | /* We always need to look at 2 bytes, sometimes we need |
| 121 | * to look at 3 and those cases are handled below. | 119 | * to look at 3 and those cases are handled below. |
| @@ -284,10 +282,9 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) | |||
| 284 | dptr++; | 282 | dptr++; |
| 285 | *dptr++ = lapb->frmr_type; | 283 | *dptr++ = lapb->frmr_type; |
| 286 | 284 | ||
| 287 | lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", | 285 | lapb_dbg(1, "(%p) S%d TX FRMR %5ph\n", |
| 288 | lapb->dev, lapb->state, | 286 | lapb->dev, lapb->state, |
| 289 | skb->data[1], skb->data[2], skb->data[3], | 287 | &skb->data[1]); |
| 290 | skb->data[4], skb->data[5]); | ||
| 291 | } else { | 288 | } else { |
| 292 | dptr = skb_put(skb, 4); | 289 | dptr = skb_put(skb, 4); |
| 293 | *dptr++ = LAPB_FRMR; | 290 | *dptr++ = LAPB_FRMR; |
| @@ -299,9 +296,8 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) | |||
| 299 | dptr++; | 296 | dptr++; |
| 300 | *dptr++ = lapb->frmr_type; | 297 | *dptr++ = lapb->frmr_type; |
| 301 | 298 | ||
| 302 | lapb_dbg(1, "(%p) S%d TX FRMR %02X %02X %02X\n", | 299 | lapb_dbg(1, "(%p) S%d TX FRMR %3ph\n", |
| 303 | lapb->dev, lapb->state, skb->data[1], | 300 | lapb->dev, lapb->state, &skb->data[1]); |
| 304 | skb->data[2], skb->data[3]); | ||
| 305 | } | 301 | } |
| 306 | 302 | ||
| 307 | lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); | 303 | lapb_transmit_buffer(lapb, skb, LAPB_RESPONSE); |
