diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/sctp/output.c | 2 | ||||
-rw-r--r-- | net/sctp/outqueue.c | 14 | ||||
-rw-r--r-- | net/sctp/sm_make_chunk.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 225c7123c41f..c3f417f7ec6e 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c | |||
@@ -699,7 +699,7 @@ static sctp_xmit_t sctp_packet_append_data(struct sctp_packet *packet, | |||
699 | * When a Fast Retransmit is being performed the sender SHOULD | 699 | * When a Fast Retransmit is being performed the sender SHOULD |
700 | * ignore the value of cwnd and SHOULD NOT delay retransmission. | 700 | * ignore the value of cwnd and SHOULD NOT delay retransmission. |
701 | */ | 701 | */ |
702 | if (chunk->fast_retransmit <= 0) | 702 | if (chunk->fast_retransmit != SCTP_NEED_FRTX) |
703 | if (transport->flight_size >= transport->cwnd) { | 703 | if (transport->flight_size >= transport->cwnd) { |
704 | retval = SCTP_XMIT_RWND_FULL; | 704 | retval = SCTP_XMIT_RWND_FULL; |
705 | goto finish; | 705 | goto finish; |
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index da8d846301c1..247ebc95c1e5 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -420,7 +420,7 @@ void sctp_retransmit_mark(struct sctp_outq *q, | |||
420 | * be added to the retransmit queue. | 420 | * be added to the retransmit queue. |
421 | */ | 421 | */ |
422 | if ((reason == SCTP_RTXR_FAST_RTX && | 422 | if ((reason == SCTP_RTXR_FAST_RTX && |
423 | (chunk->fast_retransmit > 0)) || | 423 | (chunk->fast_retransmit == SCTP_NEED_FRTX)) || |
424 | (reason != SCTP_RTXR_FAST_RTX && !chunk->tsn_gap_acked)) { | 424 | (reason != SCTP_RTXR_FAST_RTX && !chunk->tsn_gap_acked)) { |
425 | /* If this chunk was sent less then 1 rto ago, do not | 425 | /* If this chunk was sent less then 1 rto ago, do not |
426 | * retransmit this chunk, but give the peer time | 426 | * retransmit this chunk, but give the peer time |
@@ -650,8 +650,8 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt, | |||
650 | /* Mark the chunk as ineligible for fast retransmit | 650 | /* Mark the chunk as ineligible for fast retransmit |
651 | * after it is retransmitted. | 651 | * after it is retransmitted. |
652 | */ | 652 | */ |
653 | if (chunk->fast_retransmit > 0) | 653 | if (chunk->fast_retransmit == SCTP_NEED_FRTX) |
654 | chunk->fast_retransmit = -1; | 654 | chunk->fast_retransmit = SCTP_DONT_FRTX; |
655 | 655 | ||
656 | /* Force start T3-rtx timer when fast retransmitting | 656 | /* Force start T3-rtx timer when fast retransmitting |
657 | * the earliest outstanding TSN | 657 | * the earliest outstanding TSN |
@@ -680,8 +680,8 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt, | |||
680 | */ | 680 | */ |
681 | if (rtx_timeout || fast_rtx) { | 681 | if (rtx_timeout || fast_rtx) { |
682 | list_for_each_entry(chunk1, lqueue, transmitted_list) { | 682 | list_for_each_entry(chunk1, lqueue, transmitted_list) { |
683 | if (chunk1->fast_retransmit > 0) | 683 | if (chunk1->fast_retransmit == SCTP_NEED_FRTX) |
684 | chunk1->fast_retransmit = -1; | 684 | chunk1->fast_retransmit = SCTP_DONT_FRTX; |
685 | } | 685 | } |
686 | } | 686 | } |
687 | 687 | ||
@@ -1656,7 +1656,7 @@ static void sctp_mark_missing(struct sctp_outq *q, | |||
1656 | * chunk if it has NOT been fast retransmitted or marked for | 1656 | * chunk if it has NOT been fast retransmitted or marked for |
1657 | * fast retransmit already. | 1657 | * fast retransmit already. |
1658 | */ | 1658 | */ |
1659 | if (!chunk->fast_retransmit && | 1659 | if (chunk->fast_retransmit == SCTP_CAN_FRTX && |
1660 | !chunk->tsn_gap_acked && | 1660 | !chunk->tsn_gap_acked && |
1661 | TSN_lt(tsn, highest_new_tsn_in_sack)) { | 1661 | TSN_lt(tsn, highest_new_tsn_in_sack)) { |
1662 | 1662 | ||
@@ -1681,7 +1681,7 @@ static void sctp_mark_missing(struct sctp_outq *q, | |||
1681 | */ | 1681 | */ |
1682 | 1682 | ||
1683 | if (chunk->tsn_missing_report >= 3) { | 1683 | if (chunk->tsn_missing_report >= 3) { |
1684 | chunk->fast_retransmit = 1; | 1684 | chunk->fast_retransmit = SCTP_NEED_FRTX; |
1685 | do_fast_retransmit = 1; | 1685 | do_fast_retransmit = 1; |
1686 | } | 1686 | } |
1687 | } | 1687 | } |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index d68869f966c3..99fe0747cc96 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1211,7 +1211,7 @@ struct sctp_chunk *sctp_chunkify(struct sk_buff *skb, | |||
1211 | */ | 1211 | */ |
1212 | retval->tsn_missing_report = 0; | 1212 | retval->tsn_missing_report = 0; |
1213 | retval->tsn_gap_acked = 0; | 1213 | retval->tsn_gap_acked = 0; |
1214 | retval->fast_retransmit = 0; | 1214 | retval->fast_retransmit = SCTP_CAN_FRTX; |
1215 | 1215 | ||
1216 | /* If this is a fragmented message, track all fragments | 1216 | /* If this is a fragmented message, track all fragments |
1217 | * of the message (for SEND_FAILED). | 1217 | * of the message (for SEND_FAILED). |