aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/af_irda.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-06 21:25:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-11-24 04:28:48 -0500
commit6ce8e9ce5989ae13f493062975304700be86d20e (patch)
treeb714f34723d37ccd90bb5350555cbfe9dc8b9abe /net/irda/af_irda.c
parent227158db160449b6513d2e31894a135104b90e90 (diff)
new helper: memcpy_from_msg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/irda/af_irda.c')
-rw-r--r--net/irda/af_irda.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index e8c409055922..9052462cf42a 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1319,7 +1319,7 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock,
1319 skb_reserve(skb, self->max_header_size + 16); 1319 skb_reserve(skb, self->max_header_size + 16);
1320 skb_reset_transport_header(skb); 1320 skb_reset_transport_header(skb);
1321 skb_put(skb, len); 1321 skb_put(skb, len);
1322 err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len); 1322 err = memcpy_from_msg(skb_transport_header(skb), msg, len);
1323 if (err) { 1323 if (err) {
1324 kfree_skb(skb); 1324 kfree_skb(skb);
1325 goto out_err; 1325 goto out_err;
@@ -1569,7 +1569,7 @@ static int irda_sendmsg_dgram(struct kiocb *iocb, struct socket *sock,
1569 1569
1570 pr_debug("%s(), appending user data\n", __func__); 1570 pr_debug("%s(), appending user data\n", __func__);
1571 skb_put(skb, len); 1571 skb_put(skb, len);
1572 err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len); 1572 err = memcpy_from_msg(skb_transport_header(skb), msg, len);
1573 if (err) { 1573 if (err) {
1574 kfree_skb(skb); 1574 kfree_skb(skb);
1575 goto out; 1575 goto out;
@@ -1678,7 +1678,7 @@ static int irda_sendmsg_ultra(struct kiocb *iocb, struct socket *sock,
1678 1678
1679 pr_debug("%s(), appending user data\n", __func__); 1679 pr_debug("%s(), appending user data\n", __func__);
1680 skb_put(skb, len); 1680 skb_put(skb, len);
1681 err = memcpy_fromiovec(skb_transport_header(skb), msg->msg_iov, len); 1681 err = memcpy_from_msg(skb_transport_header(skb), msg, len);
1682 if (err) { 1682 if (err) {
1683 kfree_skb(skb); 1683 kfree_skb(skb);
1684 goto out; 1684 goto out;