diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-09 17:41:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-09 17:41:41 -0400 |
| commit | ae95d7126104591348d37aaf78c8325967e02386 (patch) | |
| tree | 3270712f030549d77d4c55246d056e02b9def29d /net/sctp | |
| parent | 03c5b534185f9844c1b5fcfdbae2adc32821ec42 (diff) | |
| parent | 183c948a3cb3efbf45eabed41fa7ee04c19378fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 97745351d58c..9844fe573029 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
| @@ -705,7 +705,8 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet, | |||
| 705 | /* Check whether this chunk and all the rest of pending data will fit | 705 | /* Check whether this chunk and all the rest of pending data will fit |
| 706 | * or delay in hopes of bundling a full sized packet. | 706 | * or delay in hopes of bundling a full sized packet. |
| 707 | */ | 707 | */ |
| 708 | if (chunk->skb->len + q->out_qlen >= transport->pathmtu - packet->overhead) | 708 | if (chunk->skb->len + q->out_qlen > |
| 709 | transport->pathmtu - packet->overhead - sizeof(sctp_data_chunk_t) - 4) | ||
| 709 | /* Enough data queued to fill a packet */ | 710 | /* Enough data queued to fill a packet */ |
| 710 | return SCTP_XMIT_OK; | 711 | return SCTP_XMIT_OK; |
| 711 | 712 | ||