summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-06 21:51:23 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-11-24 04:28:51 -0500
commit7eab8d9e8a722ca07bc785f73e21c3d3418defa6 (patch)
treef42c78986668929d2a2b05d88c94a36dab7c1a36 /net/can
parente169371823827dae1fd1d15bceb0fe5497c1a5ba (diff)
downloadlinux-7eab8d9e8a722ca07bc785f73e21c3d3418defa6.tar.gz
linux-7eab8d9e8a722ca07bc785f73e21c3d3418defa6.tar.bz2
linux-7eab8d9e8a722ca07bc785f73e21c3d3418defa6.zip
new helper: memcpy_to_msg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/bcm.c2
-rw-r--r--net/can/raw.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c
index b9a1f715df18..01671187e3fe 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1555,7 +1555,7 @@ static int bcm_recvmsg(struct kiocb *iocb, struct socket *sock,
if (skb->len < size)
size = skb->len;
- err = memcpy_toiovec(msg->msg_iov, skb->data, size);
+ err = memcpy_to_msg(msg, skb->data, size);
if (err < 0) {
skb_free_datagram(sk, skb);
return err;
diff --git a/net/can/raw.c b/net/can/raw.c
index 0e4004fb6876..dfdcffbb1070 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -750,7 +750,7 @@ static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,
else
size = skb->len;
- err = memcpy_toiovec(msg->msg_iov, skb->data, size);
+ err = memcpy_to_msg(msg, skb->data, size);
if (err < 0) {
skb_free_datagram(sk, skb);
return err;