Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[cascardo/linux.git] / net / ieee802154 / dgram.c

diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 8db240b..d1930b7 100644 (file)
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -275,7 +275,7 @@ static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
        if (err < 0)
                goto out_skb;
 
-       err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
+       err = memcpy_from_msg(skb_put(skb, size), msg, size);
        if (err < 0)
                goto out_skb;
 
@@ -319,7 +319,7 @@ static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk,
        }
 
        /* FIXME: skip headers if necessary ?! */
-       err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
+       err = skb_copy_datagram_msg(skb, 0, msg, copied);
        if (err)
                goto done;