diff options
author | Mark Brown <broonie@kernel.org> | 2016-11-04 14:16:38 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-11-04 14:16:38 -0400 |
commit | cc9b94029e9ef51787af908e9856b1eed314bc00 (patch) | |
tree | 9675310b89d0f6fb1f7bd9423f0638c4ee5226fd /net/lapb/lapb_in.c | |
parent | 13bed58ce8748d430a26e353a09b89f9d613a71f (diff) | |
parent | 1b5b42216469b05ef4b5916cb40b127dfab1da88 (diff) |
Merge branch 'topic/error' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-fixed
Diffstat (limited to 'net/lapb/lapb_in.c')
-rw-r--r-- | net/lapb/lapb_in.c | 5 |
1 files changed, 2 insertions, 3 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); |