summaryrefslogtreecommitdiff
path: root/net/x25
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2007-03-31 11:55:45 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:28:30 -0700
commit1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d (patch)
tree2743aa6311b434840e82b6107013c34605534816 /net/x25
parent27d7ff46a3498d3debc6ba68fb8014c702b81170 (diff)
downloadlinux-3.10-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.tar.gz
linux-3.10-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.tar.bz2
linux-3.10-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.zip
[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/x25')
-rw-r--r--net/x25/x25_in.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index ba13248aa1c..1c88762c279 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -56,14 +56,17 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
skb_reset_transport_header(skbn);
skbo = skb_dequeue(&x25->fragment_queue);
- 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);
while ((skbo =
skb_dequeue(&x25->fragment_queue)) != NULL) {
skb_pull(skbo, (x25->neighbour->extended) ?
X25_EXT_MIN_LEN : X25_STD_MIN_LEN);
- 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);
}