Merge branch 'linus' into tracing/core

[~andy/linux] / net / x25 / x25_out.c

diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c
index bb45e21ffce9edf0eb0425e5f564f035fb39141e..2b96b52114d6235980325df17ef92f8adb6c8dfd 100644 (file)
--- a/net/x25/x25_out.c
+++ b/net/x25/x25_out.c
@@ -89,7 +89,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb)
 
                        /* Duplicate the Header */
                        skb_push(skbn, header_len);
-                       memcpy(skbn->data, header, header_len);
+                       skb_copy_to_linear_data(skbn, header, header_len);
 
                        if (skb->len > 0) {
                                if (x25->neighbour->extended)