PERFORCE change 166482 for review
Andre Oppermann
andre at FreeBSD.org
Thu Jul 23 22:22:04 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166482
Change 166482 by andre at 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;
More information about the p4-projects
mailing list