Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1693718 authored by Al Viro's avatar Al Viro
Browse files

switch ipxrtr_route_packet() from iovec to msghdr 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6ce8e9ce

include/net/ipx.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int ipxrtr_add_route(__be32 network, struct ipx_interface *intrfc, 
		     unsigned char *node);

void ipxrtr_del_routes(struct ipx_interface *intrfc);

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);

int ipxrtr_route_skb(struct sk_buff *skb);

struct ipx_route *ipxrtr_lookup(__be32 net);

int ipxrtr_ioctl(unsigned int cmd, void __user *arg);

net/ipx/af_ipx.c

+1 −2
Original line number Diff line number Diff line
@@ -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:

net/ipx/ipx_route.c

+2 −2
Original line number Diff line number Diff line
@@ -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;