diff options
| author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2007-03-31 16:55:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 07:28:29 +0200 |
| commit | 27d7ff46a3498d3debc6ba68fb8014c702b81170 (patch) | |
| tree | b5a0c617cf8339524d3b1f1633e08eae7b94cf86 /net/irda | |
| parent | [NET]: Fix warnings in 3c523.c and ni52.c (diff) | |
| download | linux-27d7ff46a3498d3debc6ba68fb8014c702b81170.tar.xz linux-27d7ff46a3498d3debc6ba68fb8014c702b81170.zip | |
[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}
To clearly state the intent of copying to linear sk_buffs, _offset being a
overly long variant but interesting for the sake of saving some bytes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irttp.c | 2 | ||||
| -rw-r--r-- | net/irda/wrapper.c | 3 |
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) * Copy all fragments to a new buffer */ while ((frag = skb_dequeue(&self->rx_fragments)) != NULL) { - memcpy(skb->data+n, frag->data, frag->len); + skb_copy_to_linear_data_offset(skb, n, frag->data, frag->len); n += frag->len; 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, if(docopy) { /* Copy data without CRC (lenght already checked) */ - memcpy(newskb->data, rx_buff->data, rx_buff->len - 2); + skb_copy_to_linear_data(newskb, rx_buff->data, + rx_buff->len - 2); /* Deliver this skb */ dataskb = newskb; } else { |