diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-06 21:51:23 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 04:28:51 -0500 |
commit | 7eab8d9e8a722ca07bc785f73e21c3d3418defa6 (patch) | |
tree | f42c78986668929d2a2b05d88c94a36dab7c1a36 /net/can | |
parent | e169371823827dae1fd1d15bceb0fe5497c1a5ba (diff) |
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.c | 2 | ||||
-rw-r--r-- | net/can/raw.c | 2 |
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, | |||
1555 | if (skb->len < size) | 1555 | if (skb->len < size) |
1556 | size = skb->len; | 1556 | size = skb->len; |
1557 | 1557 | ||
1558 | err = memcpy_toiovec(msg->msg_iov, skb->data, size); | 1558 | err = memcpy_to_msg(msg, skb->data, size); |
1559 | if (err < 0) { | 1559 | if (err < 0) { |
1560 | skb_free_datagram(sk, skb); | 1560 | skb_free_datagram(sk, skb); |
1561 | return err; | 1561 | 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, | |||
750 | else | 750 | else |
751 | size = skb->len; | 751 | size = skb->len; |
752 | 752 | ||
753 | err = memcpy_toiovec(msg->msg_iov, skb->data, size); | 753 | err = memcpy_to_msg(msg, skb->data, size); |
754 | if (err < 0) { | 754 | if (err < 0) { |
755 | skb_free_datagram(sk, skb); | 755 | skb_free_datagram(sk, skb); |
756 | return err; | 756 | return err; |