summaryrefslogtreecommitdiffstats
path: root/net/rds
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-03-11 13:49:56 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-16 21:16:54 -0700
commit1123fd734df6ad82373a5a27f0f2ed3115555b9d (patch)
tree9f0348b2d603a4d18855f01bbd34249c2c2b3f72 /net/rds
parent735f61e62611161588123930823af6e6a9fd5c2c (diff)
downloadlinux-stable-1123fd734df6ad82373a5a27f0f2ed3115555b9d.tar.gz
linux-stable-1123fd734df6ad82373a5a27f0f2ed3115555b9d.tar.bz2
linux-stable-1123fd734df6ad82373a5a27f0f2ed3115555b9d.zip
RDS: sendmsg() should check sndtimeo, not rcvtimeo
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>
Diffstat (limited to 'net/rds')
-rw-r--r--net/rds/send.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/send.c b/net/rds/send.c
index b2fccfc20769..ad2e46947c8a 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -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 */