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/ipx | |
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/ipx')
-rw-r--r-- | net/ipx/af_ipx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 313ef4644069..a0c75366c93b 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c | |||
@@ -1805,8 +1805,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1805 | msg->msg_flags |= MSG_TRUNC; | 1805 | msg->msg_flags |= MSG_TRUNC; |
1806 | } | 1806 | } |
1807 | 1807 | ||
1808 | rc = skb_copy_datagram_iovec(skb, sizeof(struct ipxhdr), msg->msg_iov, | 1808 | rc = skb_copy_datagram_msg(skb, sizeof(struct ipxhdr), msg, copied); |
1809 | copied); | ||
1810 | if (rc) | 1809 | if (rc) |
1811 | goto out_free; | 1810 | goto out_free; |
1812 | if (skb->tstamp.tv64) | 1811 | if (skb->tstamp.tv64) |