projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new helper: memcpy_from_msg()
[cascardo/linux.git]
/
net
/
l2tp
/
l2tp_ppp.c
diff --git
a/net/l2tp/l2tp_ppp.c
b/net/l2tp/l2tp_ppp.c
index
b704a93
..
cc7a828
100644
(file)
--- a/
net/l2tp/l2tp_ppp.c
+++ b/
net/l2tp/l2tp_ppp.c
@@
-208,7
+208,7
@@
static int pppol2tp_recvmsg(struct kiocb *iocb, struct socket *sock,
else if (len < skb->len)
msg->msg_flags |= MSG_TRUNC;
else if (len < skb->len)
msg->msg_flags |= MSG_TRUNC;
- err = skb_copy_datagram_
iovec(skb, 0, msg->msg_iov
, len);
+ err = skb_copy_datagram_
msg(skb, 0, msg
, len);
if (likely(err == 0))
err = len;
if (likely(err == 0))
err = len;
@@
-346,8
+346,7
@@
static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msgh
skb_put(skb, 2);
/* Copy user data into skb */
skb_put(skb, 2);
/* Copy user data into skb */
- error = memcpy_fromiovec(skb_put(skb, total_len), m->msg_iov,
- total_len);
+ error = memcpy_from_msg(skb_put(skb, total_len), m, total_len);
if (error < 0) {
kfree_skb(skb);
goto error_put_sess_tun;
if (error < 0) {
kfree_skb(skb);
goto error_put_sess_tun;