diff options
| author | Xin Long <lucien.xin@gmail.com> | 2017-02-19 01:52:46 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-20 10:26:09 -0500 |
| commit | 4ea0c32f5f42f7ef33a7ecfb9b61ff0cad9b3c08 (patch) | |
| tree | ef5b3d50db0a6e1839f48be2b8484d11ab2ba9a2 /net/sctp/output.c | |
| parent | b7018d0b63003c0474451991797113605f26ee81 (diff) | |
| download | linux-4ea0c32f5f42f7ef33a7ecfb9b61ff0cad9b3c08.tar.gz linux-4ea0c32f5f42f7ef33a7ecfb9b61ff0cad9b3c08.tar.bz2 linux-4ea0c32f5f42f7ef33a7ecfb9b61ff0cad9b3c08.zip | |
sctp: add support for MSG_MORE
This patch is to add support for MSG_MORE on sctp.
It adds force_delay in sctp_datamsg to save MSG_MORE, and sets it after
creating datamsg according to the send flag. sctp_packet_can_append_data
then uses it to decide if the chunks of this msg will be sent at once or
delay it.
Note that unlike [1], this patch saves MSG_MORE in datamsg, instead of
in assoc. As sctp enqueues the chunks first, then dequeue them one by
one. If it's saved in assoc,the current msg's send flag (MSG_MORE) may
affect other chunks' bundling.
Since last patch, sctp flush out queue once assoc state falls into
SHUTDOWN_PENDING, the close block problem mentioned in [1] has been
solved as well.
[1] https://patchwork.ozlabs.org/patch/372404/
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/output.c')
| -rw-r--r-- | net/sctp/output.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 814eac047467..85406d5f8f41 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -704,18 +704,15 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet, * unacknowledged. */ - if (sctp_sk(asoc->base.sk)->nodelay) - /* Nagle disabled */ + if ((sctp_sk(asoc->base.sk)->nodelay || inflight == 0) && + !chunk->msg->force_delay) + /* Nothing unacked */ return SCTP_XMIT_OK; if (!sctp_packet_empty(packet)) /* Append to packet */ return SCTP_XMIT_OK; - if (inflight == 0) - /* Nothing unacked */ - return SCTP_XMIT_OK; - if (!sctp_state(asoc, ESTABLISHED)) return SCTP_XMIT_OK; |