[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}

[deliverable/linux.git] / drivers / net / pppoe.c

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index e94790632d558b6b5b4221fcccf0905a4630ed75..e9fb616ff663e6a6bf629b5b1465a3376bf862d4 100644 (file)
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -869,7 +869,8 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
                        goto abort;
 
                skb_reserve(skb2, dev->hard_header_len + sizeof(struct pppoe_hdr));
-               memcpy(skb_put(skb2, skb->len), skb->data, skb->len);
+               skb_copy_from_linear_data(skb, skb_put(skb2, skb->len),
+                                         skb->len);
        } else {
                /* Make a clone so as to not disturb the original skb,
                 * give dev_queue_xmit something it can free.