]> git.baikalelectronics.ru Git - kernel.git/commitdiff
RDS: sendmsg() should check sndtimeo, not rcvtimeo
authorAndy Grover <andy.grover@oracle.com>
Thu, 11 Mar 2010 13:49:56 +0000 (13:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Mar 2010 04:16:54 +0000 (21:16 -0700)
Most likely cut n paste error - sendmsg() was checking sock_rcvtimeo.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/rds/send.c

index b2fccfc207690f5bfa231af389031a7dce8a218b..ad2e46947c8a2cf736f2f013cc28cfced6bf54e3 100644 (file)
@@ -815,7 +815,7 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
        int ret = 0;
        int queued = 0, allocated_mr = 0;
        int nonblock = msg->msg_flags & MSG_DONTWAIT;
-       long timeo = sock_rcvtimeo(sk, nonblock);
+       long timeo = sock_sndtimeo(sk, nonblock);
 
        /* Mirror Linux UDP mirror of BSD error message compatibility */
        /* XXX: Perhaps MSG_MORE someday */