From f02304158c371f16adb8d879065823cf09a2029a Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Thu, 11 Mar 2010 13:49:56 +0000 Subject: [PATCH] --- yaml --- r: 193586 b: refs/heads/master c: 1123fd734df6ad82373a5a27f0f2ed3115555b9d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/rds/send.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 853234cab5ae..4cfd6c210b91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 735f61e62611161588123930823af6e6a9fd5c2c +refs/heads/master: 1123fd734df6ad82373a5a27f0f2ed3115555b9d diff --git a/trunk/net/rds/send.c b/trunk/net/rds/send.c index b2fccfc20769..ad2e46947c8a 100644 --- a/trunk/net/rds/send.c +++ b/trunk/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 */