---

yaml --- r: 360781 b: refs/heads/master c: e67f85e h: refs/heads/master i: 360779: c8fc876 v: v3
git-mirror · Feb 28, 2013 · a21dfa6 · a21dfa6
1 parent 6f8efe8
commit a21dfa6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70fc69bc5a54d9776ace7c99d46eb533f8fb6e89
+refs/heads/master: e67f85ecd83de66d4f25f2e0f90bb0d01a52ddd8
diff --git a/trunk/net/sctp/ulpqueue.c b/trunk/net/sctp/ulpqueue.c
@@ -969,11 +969,16 @@ static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq,
 
 	tsnmap = &ulpq->asoc->peer.tsn_map;
 
-	while ((skb = __skb_dequeue_tail(list)) != NULL) {
-		freed += skb_headlen(skb);
+	while ((skb = skb_peek_tail(list)) != NULL) {
 		event = sctp_skb2event(skb);
 		tsn = event->tsn;
 
+		/* Don't renege below the Cumulative TSN ACK Point. */
+		if (TSN_lte(tsn, sctp_tsnmap_get_ctsn(tsnmap)))
+			break;
+
+		__skb_unlink(skb, list);
+		freed += skb_headlen(skb);
 		sctp_ulpevent_free(event);
 		sctp_tsnmap_renege(tsnmap, tsn);
 		if (freed >= needed)