diff options
author | David S. Miller <davem@davemloft.net> | 2014-11-05 16:46:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-05 16:46:40 -0500 |
commit | 51f3d02b980a338cd291d2bc7629cdfb2568424b (patch) | |
tree | f49898ea87db3d5e3f5c248ab21f6ed0a70785b8 /net/x25 | |
parent | 1d76c1d028975df8488d1ae18a76f268eb5efa93 (diff) |
net: Add and use skb_copy_datagram_msg() helper.
This encapsulates all of the skb_copy_datagram_iovec() callers
with call argument signature "skb, offset, msghdr->msg_iov, length".
When we move to iov_iters in the networking, the iov_iter object will
sit in the msghdr.
Having a helper like this means there will be less places to touch
during that transformation.
Based upon descriptions and patch from Al Viro.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r-- | net/x25/af_x25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 5ad4418ef093..59e785bfde65 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -1335,7 +1335,7 @@ static int x25_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1335 | /* Currently, each datagram always contains a complete record */ | 1335 | /* Currently, each datagram always contains a complete record */ |
1336 | msg->msg_flags |= MSG_EOR; | 1336 | msg->msg_flags |= MSG_EOR; |
1337 | 1337 | ||
1338 | rc = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); | 1338 | rc = skb_copy_datagram_msg(skb, 0, msg, copied); |
1339 | if (rc) | 1339 | if (rc) |
1340 | goto out_free_dgram; | 1340 | goto out_free_dgram; |
1341 | 1341 | ||