This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / decnet / af_decnet.c

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 381df28..c08a80f 100644 (file)
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1075,7 +1075,7 @@ static int dn_accept(struct socket *sock, struct socket *newsock, int flags)
                skb = dn_wait_for_connect(sk, &timeo);
                if (IS_ERR(skb)) {
                        release_sock(sk);
-                       return PTR_ERR(skb);
+                       return PTR_ERR(sk);
                }
        }
 
@@ -1723,7 +1723,7 @@ static int dn_recvmsg(struct kiocb *iocb, struct socket *sock,
                        goto out;
 
                if (signal_pending(current)) {
-                       rv = sock_intr_errno(timeo);
+                       rv = -ERESTARTSYS;
                        goto out;
                }
 
@@ -1957,7 +1957,7 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock,
                        goto out;
 
                if (signal_pending(current)) {
-                       err = sock_intr_errno(timeo);
+                       err = -ERESTARTSYS;
                        goto out;
                }
 
@@ -1992,7 +1992,7 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock,
                /*
                 * Get a suitably sized skb.
                 */
-               skb = dn_alloc_send_skb(sk, &len, flags & MSG_DONTWAIT, timeo, &err);
+               skb = dn_alloc_send_skb(sk, &len, flags & MSG_DONTWAIT, &err);
 
                if (err)
                        break;