Author: tuexen
Date: Thu Oct 28 19:03:26 2010
New Revision: 214476
URL: http://svn.freebsd.org/changeset/base/214476
Log:
MFC r212711:
Use TAILQ_EMPTY() for testing if a tail queue is empty.
Set whoFrom to NULL after freeing whoFrom.
Modified:
stable/8/sys/netinet/sctp_indata.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/netinet/sctp_indata.c
==============================================================================
--- stable/8/sys/netinet/sctp_indata.c Thu Oct 28 19:00:45 2010
(r214475)
+++ stable/8/sys/netinet/sctp_indata.c Thu Oct 28 19:03:26 2010
(r214476)
@@ -708,9 +708,10 @@ protocol_error:
control->data = NULL;
asoc->size_on_all_streams -=
control->length;
sctp_ucount_decr(asoc->cnt_on_all_streams);
- if (control->whoFrom)
+ if (control->whoFrom) {
sctp_free_remote_addr(control->whoFrom);
- control->whoFrom = NULL;
+ control->whoFrom = NULL;
+ }
sctp_free_a_readq(stcb, control);
return;
} else {
@@ -4845,7 +4846,7 @@ sctp_handle_sack(struct mbuf *m, int off
if (asoc->pr_sctp_cnt != 0)
asoc->pr_sctp_cnt--;
}
- if ((TAILQ_FIRST(&asoc->sent_queue) == NULL) &&
+ if (TAILQ_EMPTY(&asoc->sent_queue) &&
(asoc->total_flight > 0)) {
#ifdef INVARIANTS
panic("Warning flight size is postive and should be 0");
@@ -5818,7 +5819,7 @@ sctp_handle_forward_tsn(struct sctp_tcb
*/
sctp_slide_mapping_arrays(stcb);
- if (TAILQ_FIRST(&asoc->reasmqueue)) {
+ if (!TAILQ_EMPTY(&asoc->reasmqueue)) {
/* now lets kick out and check for more fragmented delivery */
/* sa_ignore NO_NULL_CHK */
sctp_deliver_reasm_check(stcb, &stcb->asoc);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
