patch-2.0.8 linux/net/ipx/af_ipx.c

Next file: linux/net/netsyms.c
Previous file: linux/net/ipv4/ipmr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.7/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
@@ -1267,7 +1267,7 @@
  *	Route an outgoing frame from a socket.
  */
 
-static int ipxrtr_route_packet(ipx_socket *sk, struct sockaddr_ipx *usipx, struct iovec *iov, int len)
+static int ipxrtr_route_packet(ipx_socket *sk, struct sockaddr_ipx *usipx, struct iovec *iov, int len, int noblock)
 {
 	struct sk_buff *skb;
 	ipx_interface *intrfc;
@@ -1296,7 +1296,7 @@
 	size=sizeof(ipx_packet)+len;
 	size += ipx_offset;
 
-	skb=sock_alloc_send_skb(sk, size, 0, 0, &err);
+	skb=sock_alloc_send_skb(sk, size, 0, noblock, &err);
 	if(skb==NULL)
 		return err;
 
@@ -2133,7 +2133,7 @@
 		memcpy(usipx->sipx_node,sk->protinfo.af_ipx.dest_addr.node,IPX_NODE_LEN);
 	}
 	
-	retval = ipxrtr_route_packet(sk, usipx, msg->msg_iov, len);
+	retval = ipxrtr_route_packet(sk, usipx, msg->msg_iov, len, noblock);
 	if (retval < 0) 
 		return retval;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov