Merge tag 'mlx5-updates-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / vmw_vsock / virtio_transport_common.c

diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index 18e24793659f928221297208ff4c82c8e385d14b..7d6ee03f276223c8f2674641cb617a10bbd0958f 100644 (file)
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -99,7 +99,7 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque)
        if (!skb)
                return NULL;
 
-       hdr = (struct af_vsockmon_hdr *)skb_put(skb, sizeof(*hdr));
+       hdr = skb_put(skb, sizeof(*hdr));
 
        /* pkt->hdr is little-endian so no need to byteswap here */
        hdr->src_cid = pkt->hdr.src_cid;
@@ -132,12 +132,10 @@ static struct sk_buff *virtio_transport_build_skb(void *opaque)
                break;
        }
 
-       t_hdr = skb_put(skb, sizeof(pkt->hdr));
-       memcpy(t_hdr, &pkt->hdr, sizeof(pkt->hdr));
+       t_hdr = skb_put_data(skb, &pkt->hdr, sizeof(pkt->hdr));
 
        if (pkt->len) {
-               payload = skb_put(skb, pkt->len);
-               memcpy(payload, pkt->buf, pkt->len);
+               payload = skb_put_data(skb, pkt->buf, pkt->len);
        }
 
        return skb;