summaryrefslogtreecommitdiff
path: root/net/netrom/nr_in.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2007-03-31 18:55:45 +0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 09:28:30 +0400
commit1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d (patch)
tree2743aa6311b434840e82b6107013c34605534816 /net/netrom/nr_in.c
parent27d7ff46a3498d3debc6ba68fb8014c702b81170 (diff)
downloadlinux-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.tar.xz
[SK_BUFF]: Some more conversions to skb_copy_from_linear_data
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'net/netrom/nr_in.c')
-rw-r--r--net/netrom/nr_in.c4
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)
skb_reset_transport_header(skbn);
while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) {
- memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);
+ skb_copy_from_linear_data(skbo,
+ skb_put(skbn, skbo->len),
+ skbo->len);
kfree_skb(skbo);
}