aboutsummaryrefslogtreecommitdiffstats
path: root/net/phonet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-05 16:46:40 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-05 16:46:40 -0500
commit51f3d02b980a338cd291d2bc7629cdfb2568424b (patch)
treef49898ea87db3d5e3f5c248ab21f6ed0a70785b8 /net/phonet
parent1d76c1d028975df8488d1ae18a76f268eb5efa93 (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/phonet')
-rw-r--r--net/phonet/datagram.c2
-rw-r--r--net/phonet/pep.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/phonet/datagram.c b/net/phonet/datagram.c
index 290352c0e6b4..0918bc21eae6 100644
--- a/net/phonet/datagram.c
+++ b/net/phonet/datagram.c
@@ -150,7 +150,7 @@ static int pn_recvmsg(struct kiocb *iocb, struct sock *sk,
150 copylen = len; 150 copylen = len;
151 } 151 }
152 152
153 rval = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copylen); 153 rval = skb_copy_datagram_msg(skb, 0, msg, copylen);
154 if (rval) { 154 if (rval) {
155 rval = -EFAULT; 155 rval = -EFAULT;
156 goto out; 156 goto out;
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index 70a547ea5177..44b2123e22b8 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -1296,7 +1296,7 @@ copy:
1296 else 1296 else
1297 len = skb->len; 1297 len = skb->len;
1298 1298
1299 err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, len); 1299 err = skb_copy_datagram_msg(skb, 0, msg, len);
1300 if (!err) 1300 if (!err)
1301 err = (flags & MSG_TRUNC) ? skb->len : len; 1301 err = (flags & MSG_TRUNC) ? skb->len : len;
1302 1302