aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipx/af_ipx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipx/af_ipx.c')
-rw-r--r--net/ipx/af_ipx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 91729b807c7d..a0c75366c93b 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -306,7 +306,7 @@ void ipxitf_down(struct ipx_interface *intrfc)
306 spin_unlock_bh(&ipx_interfaces_lock); 306 spin_unlock_bh(&ipx_interfaces_lock);
307} 307}
308 308
309static __inline__ void __ipxitf_put(struct ipx_interface *intrfc) 309static void __ipxitf_put(struct ipx_interface *intrfc)
310{ 310{
311 if (atomic_dec_and_test(&intrfc->refcnt)) 311 if (atomic_dec_and_test(&intrfc->refcnt))
312 __ipxitf_down(intrfc); 312 __ipxitf_down(intrfc);
@@ -1805,8 +1805,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
1805 msg->msg_flags |= MSG_TRUNC; 1805 msg->msg_flags |= MSG_TRUNC;
1806 } 1806 }
1807 1807
1808 rc = skb_copy_datagram_iovec(skb, sizeof(struct ipxhdr), msg->msg_iov, 1808 rc = skb_copy_datagram_msg(skb, sizeof(struct ipxhdr), msg, copied);
1809 copied);
1810 if (rc) 1809 if (rc)
1811 goto out_free; 1810 goto out_free;
1812 if (skb->tstamp.tv64) 1811 if (skb->tstamp.tv64)