Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / net / rose / af_rose.c

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index a85c1a086ae44f71b48be0112e08ae5164ac2c9e..43bac7c4dd9e62b136b97ad2fa99d81dbd39bf11 100644 (file)
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1121,7 +1121,7 @@ static int rose_sendmsg(struct kiocb *iocb, struct socket *sock,
        skb_reset_transport_header(skb);
        skb_put(skb, len);
 
-       err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len);
+       err = memcpy_from_msg(skb_transport_header(skb), msg, len);
        if (err) {
                kfree_skb(skb);
                return err;
@@ -1249,7 +1249,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,
                msg->msg_flags |= MSG_TRUNC;
        }
 
-       skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+       skb_copy_datagram_msg(skb, 0, msg, copied);
 
        if (msg->msg_name) {
                struct sockaddr_rose *srose;