diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-25 23:45:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-25 23:45:53 -0700 |
| commit | bdd94789d2348e20d13c1d5e477c8cf830dd204b (patch) | |
| tree | 14726d6f25d20e7e84f26e4c834e3187e017deaa /net | |
| parent | 3546c7508d7e97fd855f8ac37afdd09622fa5ce1 (diff) | |
| download | kernel-crypto-bdd94789d2348e20d13c1d5e477c8cf830dd204b.tar.gz kernel-crypto-bdd94789d2348e20d13c1d5e477c8cf830dd204b.tar.xz kernel-crypto-bdd94789d2348e20d13c1d5e477c8cf830dd204b.zip | |
[TIPC]: Connected send now checks socket state when retrying congested send.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tipc/socket.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 361dc342f37..9c834fc3011 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -565,15 +565,15 @@ static int send_packet(struct kiocb *iocb, struct socket *sock, return -ERESTARTSYS; } - if (unlikely(sock->state != SS_CONNECTED)) { - if (sock->state == SS_DISCONNECTING) - res = -EPIPE; - else - res = -ENOTCONN; - goto exit; - } - do { + if (unlikely(sock->state != SS_CONNECTED)) { + if (sock->state == SS_DISCONNECTING) + res = -EPIPE; + else + res = -ENOTCONN; + goto exit; + } + res = tipc_send(tsock->p->ref, m->msg_iovlen, m->msg_iov); if (likely(res != -ELINKCONG)) { exit: |