aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/irttp.c2
-rw-r--r--net/irda/wrapper.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index b55bc8f989df..3279897a01b0 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -256,7 +256,7 @@ static struct sk_buff *irttp_reassemble_skb(struct tsap_cb *self)
256 * Copy all fragments to a new buffer 256 * Copy all fragments to a new buffer
257 */ 257 */
258 while ((frag = skb_dequeue(&self->rx_fragments)) != NULL) { 258 while ((frag = skb_dequeue(&self->rx_fragments)) != NULL) {
259 memcpy(skb->data+n, frag->data, frag->len); 259 skb_copy_to_linear_data_offset(skb, n, frag->data, frag->len);
260 n += frag->len; 260 n += frag->len;
261 261
262 dev_kfree_skb(frag); 262 dev_kfree_skb(frag);
diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c
index 2acc66dfb558..a7a7f191f1a8 100644
--- a/net/irda/wrapper.c
+++ b/net/irda/wrapper.c
@@ -239,7 +239,8 @@ async_bump(struct net_device *dev,
239 239
240 if(docopy) { 240 if(docopy) {
241 /* Copy data without CRC (lenght already checked) */ 241 /* Copy data without CRC (lenght already checked) */
242 memcpy(newskb->data, rx_buff->data, rx_buff->len - 2); 242 skb_copy_to_linear_data(newskb, rx_buff->data,
243 rx_buff->len - 2);
243 /* Deliver this skb */ 244 /* Deliver this skb */
244 dataskb = newskb; 245 dataskb = newskb;
245 } else { 246 } else {