switch ipxrtr_route_packet() from iovec to msghdr

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 3 insertions, 4 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 97dc4320ac15..f11ad1d95e0e 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1745,8 +1745,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
                 memcpy(usipx->sipx_node, ipxs->dest_addr.node, IPX_NODE_LEN);
         }
 
-        rc = ipxrtr_route_packet(sk, usipx, msg->msg_iov, len,
-                                 flags & MSG_DONTWAIT);
+        rc = ipxrtr_route_packet(sk, usipx, msg, len, flags & MSG_DONTWAIT);
         if (rc >= 0)
                 rc = len;
 out:
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;