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/llc | |
| 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/llc')
| -rw-r--r-- | net/llc/af_llc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index bb9cbc17d926..af662669f951 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
| @@ -819,8 +819,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 819 | used = len; | 819 | used = len; |
| 820 | 820 | ||
| 821 | if (!(flags & MSG_TRUNC)) { | 821 | if (!(flags & MSG_TRUNC)) { |
| 822 | int rc = skb_copy_datagram_iovec(skb, offset, | 822 | int rc = skb_copy_datagram_msg(skb, offset, msg, used); |
| 823 | msg->msg_iov, used); | ||
| 824 | if (rc) { | 823 | if (rc) { |
| 825 | /* Exception. Bailout! */ | 824 | /* Exception. Bailout! */ |
| 826 | if (!copied) | 825 | if (!copied) |
