diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2017-09-09 15:51:17 +0000 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2017-09-09 15:51:17 +0000 |
| commit | f80da46b5117930349a5d033857c94f659f687ce (patch) | |
| tree | 66f2befe130b6c52eeeca652d5e6732f03e51483 /code/core | |
| parent | 7d3e6b74812527f69aabf9c1bbb0eb37051f94da (diff) | |
| parent | 2f99b87aed4d6a5934c8760f329225563698305a (diff) | |
fixed conflict
Diffstat (limited to 'code/core')
| -rw-r--r-- | code/core/rbuf_send.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/code/core/rbuf_send.c b/code/core/rbuf_send.c index 323596f..bc1c1b9 100644 --- a/code/core/rbuf_send.c +++ b/code/core/rbuf_send.c @@ -82,7 +82,7 @@ ssize_t ecp_rbuf_handle_ack(ECPConnection *conn, ecp_seq_t seq, unsigned char mt int rv = ECP_OK; buf = conn->rbuf.send; - if (buf == NULL) return ECP_ERR; + if (buf == NULL) return ECP_OK; if (size < 0) return size; if (size < rsize) return ECP_ERR; |