diff options
Diffstat (limited to 'net/netrom/nr_in.c')
-rw-r--r-- | net/netrom/nr_in.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index e6dc749e14be..68176483617f 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c | |||
@@ -54,7 +54,9 @@ static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more) | |||
54 | skb_reset_transport_header(skbn); | 54 | skb_reset_transport_header(skbn); |
55 | 55 | ||
56 | while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) { | 56 | while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) { |
57 | memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); | 57 | skb_copy_from_linear_data(skbo, |
58 | skb_put(skbn, skbo->len), | ||
59 | skbo->len); | ||
58 | kfree_skb(skbo); | 60 | kfree_skb(skbo); |
59 | } | 61 | } |
60 | 62 | ||