PERFORCE change 166124 for review

[Andre Oppermann]

http://perforce.freebsd.org/chv.cgi?CH=166124

Change 166124 by andre at andre_t61 on 2009/07/15 09:44:11

	Use tcp_sack_free() in all cases.

Affected files ...

.. //depot/projects/tcp_new/netinet/tcp_sack.c#6 edit

Differences ...

==== //depot/projects/tcp_new/netinet/tcp_sack.c#6 (text+ko) ====

@@ -151,7 +151,7 @@
 		if (SEQ_LT(th_ack, tsb->tsb_blk.start))
 			break;
 		else
-			RB_REMOVE(tcp_sackblocks, &tp->snd_sackblocks, tsb);
+			tcp_sack_free(tp, tsb);
 	}
 
 	if ((to->to_flags & TOF_SACK) && to->to_nsacks == 0) {
@@ -184,7 +184,7 @@
 
 		/* Return match that has at least partial overlap to either side. */
 		if ((tsb = RB_FIND(tcp_sackblocks, &tp->snd_sackblocks, &sack)) != NULL) {
-			/* within a block, was a duplicate retransmit, D-SACK */
+			/* within a block, was a duplicate retransmit, D-SACK. */
 			if (SEQ_GEQ(sack.tsb_blk.start, tsb->tsb_blk.start) &&
 			    SEQ_LEQ(sack.tsb_blk.end, tsb->tsb_blk.end)) {
 				continue;
@@ -235,8 +235,7 @@
 	struct tcp_sack_block *tsb, *tsbn;
 
 	RB_FOREACH_SAFE(tsb, tcp_sackblocks, &tp->snd_sackblocks, tsbn) {
-		RB_REMOVE(tcp_sackblocks, &tp->snd_sackblocks, tsb);
-		uma_zfree(tcp_sackblock_zone, tsb);
+		tcp_sack_free(tp, tsb);
 	}
 }