summaryrefslogtreecommitdiff
path: root/net/sctp
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2010-04-30 22:38:53 -0400
committerVlad Yasevich <vladislav.yasevich@hp.com>2010-04-30 22:38:53 -0400
commitbc4f841a05364b2572bcc266e9fd7e9cf5f06d5b (patch)
tree4d49c9d95422f5028b41920a960c8f4b33e4e76c /net/sctp
parent6429d3dc4bd6251b01c11b851e23a4d60f079e06 (diff)
downloadlinux-3.10-bc4f841a05364b2572bcc266e9fd7e9cf5f06d5b.tar.gz
linux-3.10-bc4f841a05364b2572bcc266e9fd7e9cf5f06d5b.tar.bz2
linux-3.10-bc4f841a05364b2572bcc266e9fd7e9cf5f06d5b.zip
sctp: fix to retranmit at least one DATA chunk
While doing retranmit, if control chunk exists, such as FORWARD TSN chunk, and the DATA chunk can not be bundled with this control chunk because of PMTU limit, no DATA chunk will be retranmitted in the current implementation. This patch makes sure to retranmit at least one DATA chunk in this case. Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/outqueue.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 16d451a62b3..e333d583361 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -598,11 +598,23 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
if (fast_rtx && !chunk->fast_retransmit)
continue;
+redo:
/* Attempt to append this chunk to the packet. */
status = sctp_packet_append_chunk(pkt, chunk);
switch (status) {
case SCTP_XMIT_PMTU_FULL:
+ if (!pkt->has_data && !pkt->has_cookie_echo) {
+ /* If this packet did not contain DATA then
+ * retransmission did not happen, so do it
+ * again. We'll ignore the error here since
+ * control chunks are already freed so there
+ * is nothing we can do.
+ */
+ sctp_packet_transmit(pkt);
+ goto redo;
+ }
+
/* Send this packet. */
error = sctp_packet_transmit(pkt);