summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2011-04-19 21:32:28 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-20 01:51:06 -0700
commit4c6a6f42131dd750dcfe3c71e63bfc046e5a227e (patch)
tree3f339059c819b083700e803319fa54a4666bd312
parent92c73af58e9f1b487322ce25a7a67889c9d91343 (diff)
downloadlinux-3.10-4c6a6f42131dd750dcfe3c71e63bfc046e5a227e.tar.gz
linux-3.10-4c6a6f42131dd750dcfe3c71e63bfc046e5a227e.tar.bz2
linux-3.10-4c6a6f42131dd750dcfe3c71e63bfc046e5a227e.zip
sctp: move chunk from retransmit queue to abandoned list
If there is still data waiting to retransmit and remain in retransmit queue, while doing the next retransmit, if the chunk is abandoned, we should move it to abandoned list. Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/outqueue.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 3e9d8d2bbe7..1c88c8911dc 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -577,6 +577,13 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
* try to send as much as possible.
*/
list_for_each_entry_safe(chunk, chunk1, lqueue, transmitted_list) {
+ /* If the chunk is abandoned, move it to abandoned list. */
+ if (sctp_chunk_abandoned(chunk)) {
+ list_del_init(&chunk->transmitted_list);
+ sctp_insert_list(&q->abandoned,
+ &chunk->transmitted_list);
+ continue;
+ }
/* Make sure that Gap Acked TSNs are not retransmitted. A
* simple approach is just to move such TSNs out of the