From owner-p4-projects@FreeBSD.ORG  Thu Jul 23 22:22:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3975F1065673; Thu, 23 Jul 2009 22:22:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE0D6106566B
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 22:22:02 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DCACC8FC18
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 22:22:02 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6NMM2V6095486
	for <perforce@freebsd.org>; Thu, 23 Jul 2009 22:22:02 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6NMM2MG095484
	for perforce@freebsd.org; Thu, 23 Jul 2009 22:22:02 GMT
	(envelope-from andre@freebsd.org)
Date: Thu, 23 Jul 2009 22:22:02 GMT
Message-Id: <200907232222.n6NMM2MG095484@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166482 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jul 2009 22:22:04 -0000

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

Change 166482 by andre@andre_t61 on 2009/07/23 22:21:30

	Simplify logic as m_freem() ignores NULL pointers (mbufs already free'd).
	Update some comments.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_reass.c#46 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_reass.c#46 (text+ko) ====

@@ -236,8 +236,7 @@
 	trb = RB_REMOVE(tcp_ra, &tp->rcv_reass, trb);
 	KASSERT(trb != NULL, ("%s: RB_REMOVE failed", __func__));
 	LIST_REMOVE(trb, trb_sack);
-	if (trb->trb_m != NULL)
-		m_freem(trb->trb_m);
+	m_freem(trb->trb_m);
 	tp->rcv_reass_size -= SEQ_DELTA(trb->trb_seqs, trb->trb_seqe);
 	tp->rcv_reass_blocks--;
 	uma_zfree(tcp_reass_zone, trb);
@@ -489,10 +488,10 @@
 		trb->trb_m = NULL;
 		trb->trb_mt = NULL;
 	}
-	if (trb == &trbs) {
-		if (trb->trb_m != NULL)
-			m_freem(trb->trb_m);
-	} else
+
+	if (trb == &trbs)
+		m_freem(trb->trb_m);
+	else
 		tcp_reass_free(tp, trb);
 
 	/* NB: sorwakeup_locked() does a implicit socket buffer unlock. */
@@ -620,7 +619,7 @@
 	KASSERT(!LIST_EMPTY(&tp->rcv_reass_sack),
 	    ("%s: sack list empty", __func__));
 
-	/* Create D-SACK block and temporarily insert it. */
+	/* Create fake SACK block for D-SACK and prepend it. */
 	if (tp->rcv_reass_dsack.start != tp->rcv_reass_dsack.end) {
 		bzero(&trbs, sizeof(trbs));
 		trbs.trb_seqs = htonl(tp->rcv_reass_dsack.start);
@@ -646,7 +645,7 @@
 		nsacks++;
 	}
 
-	/* Remove D-SACK block again. */
+	/* Remove fake D-SACK block again. */
 	if (LIST_FIRST(&tp->rcv_reass_sack) == &trbs) {
 		LIST_REMOVE(&trbs, trb_sack);
 		tp->rcv_reass_dsack.start = 0;