diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2007-03-31 16:55:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 07:28:30 +0200 |
| commit | 1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d (patch) | |
| tree | 2743aa6311b434840e82b6107013c34605534816 /net/x25/x25_in.c | |
| parent | [SK_BUFF]: Introduce skb_copy_to_linear_data{_offset} (diff) | |
| download | linux-1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d.tar.xz linux-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/x25_in.c')
| -rw-r--r-- | net/x25/x25_in.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c index ba13248aa1c3..1c88762c2794 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); } |