From 689cd6863a9cabfe8c6e9e3da2c6462bd49db28e Mon Sep 17 00:00:00 2001 From: Russ Gorby Date: Tue, 14 Jun 2011 13:23:29 -0700 Subject: [PATCH] --- yaml --- r: 254140 b: refs/heads/master c: 57f2104f39995bac332ddc492fbf60aa28e0c35e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/n_gsm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 559fd731ad2a..65dc7d2f5f2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7263287af93db4d5cf324a30546f2143419b7900 +refs/heads/master: 57f2104f39995bac332ddc492fbf60aa28e0c35e diff --git a/trunk/drivers/tty/n_gsm.c b/trunk/drivers/tty/n_gsm.c index 7290394e3131..19b4ae052af8 100644 --- a/trunk/drivers/tty/n_gsm.c +++ b/trunk/drivers/tty/n_gsm.c @@ -875,7 +875,8 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm, *dp++ = last << 7 | first << 6 | 1; /* EA */ len--; } - memcpy(dp, skb_pull(dlci->skb, len), len); + memcpy(dp, dlci->skb->data, len); + skb_pull(dlci->skb, len); __gsm_data_queue(dlci, msg); if (last) dlci->skb = NULL;