diff options
| author | Andy Grover <andy.grover@oracle.com> | 2010-03-11 08:49:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-17 00:16:54 -0400 |
| commit | 1123fd734df6ad82373a5a27f0f2ed3115555b9d (patch) | |
| tree | 9f0348b2d603a4d18855f01bbd34249c2c2b3f72 /net/rds | |
| parent | 735f61e62611161588123930823af6e6a9fd5c2c (diff) | |
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.c | 2 |
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, | |||
| 815 | int ret = 0; | 815 | int ret = 0; |
| 816 | int queued = 0, allocated_mr = 0; | 816 | int queued = 0, allocated_mr = 0; |
| 817 | int nonblock = msg->msg_flags & MSG_DONTWAIT; | 817 | int nonblock = msg->msg_flags & MSG_DONTWAIT; |
| 818 | long timeo = sock_rcvtimeo(sk, nonblock); | 818 | long timeo = sock_sndtimeo(sk, nonblock); |
| 819 | 819 | ||
| 820 | /* Mirror Linux UDP mirror of BSD error message compatibility */ | 820 | /* Mirror Linux UDP mirror of BSD error message compatibility */ |
| 821 | /* XXX: Perhaps MSG_MORE someday */ | 821 | /* XXX: Perhaps MSG_MORE someday */ |