diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-26 04:02:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-26 04:02:51 +0300 |
| commit | d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34 (patch) | |
| tree | 794bd9737e15ecc636e2e3ef4c060c8e24488ca3 /net/ipx/ipx_route.c | |
| parent | aa99c47933d2c9a7622440d1b08ebb46ad8bd741 (diff) | |
| parent | 083735f4b01b703184c0e11c2e384b2c60a8aea4 (diff) | |
| download | linux-d3fc6b3fddd54c2220a075aefc4e5e5ca25cff34.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
More work from Al Viro to move away from modifying iovecs
by using iov_iter instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx/ipx_route.c')
| -rw-r--r-- | net/ipx/ipx_route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c index 67e7ad3d46b1..3e2a32a9f3bd 100644 --- a/net/ipx/ipx_route.c +++ b/net/ipx/ipx_route.c @@ -165,7 +165,7 @@ int ipxrtr_route_skb(struct sk_buff *skb) * Route an outgoing frame from a socket. */ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx, - struct iovec *iov, size_t len, int noblock) + struct msghdr *msg, size_t len, int noblock) { struct sk_buff *skb; struct ipx_sock *ipxs = ipx_sk(sk); @@ -229,7 +229,7 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx, memcpy(ipx->ipx_dest.node, usipx->sipx_node, IPX_NODE_LEN); ipx->ipx_dest.sock = usipx->sipx_port; - rc = memcpy_fromiovec(skb_put(skb, len), iov, len); + rc = memcpy_from_msg(skb_put(skb, len), msg, len); if (rc) { kfree_skb(skb); goto out_put; |