svn commit: r188527 - in stable/7/sys: . netinet
Randall Stewart
rrs at FreeBSD.org
Thu Feb 12 10:24:55 PST 2009
Author: rrs
Date: Thu Feb 12 18:24:54 2009
New Revision: 188527
URL: http://svn.freebsd.org/changeset/base/188527
Log:
MFC 184333
Invariants changes that make more sense.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/netinet/sctp_timer.c
stable/7/sys/netinet/sctp_timer.h
Modified: stable/7/sys/netinet/sctp_timer.c
==============================================================================
--- stable/7/sys/netinet/sctp_timer.c Thu Feb 12 18:22:11 2009 (r188526)
+++ stable/7/sys/netinet/sctp_timer.c Thu Feb 12 18:24:54 2009 (r188527)
@@ -561,7 +561,8 @@ sctp_backoff_on_timeout(struct sctp_tcb
}
}
-void
+#ifndef INVARIANTS
+static void
sctp_recover_sent_list(struct sctp_tcb *stcb)
{
struct sctp_tmit_chunk *chk, *tp2;
@@ -604,6 +605,8 @@ sctp_recover_sent_list(struct sctp_tcb *
}
}
+#endif
+
static int
sctp_mark_all_for_resend(struct sctp_tcb *stcb,
struct sctp_nets *net,
@@ -679,7 +682,9 @@ sctp_mark_all_for_resend(struct sctp_tcb
/* Now on to each chunk */
num_mk = cnt_mk = 0;
tsnfirst = tsnlast = 0;
+#ifndef INVARIANTS
start_again:
+#endif
chk = TAILQ_FIRST(&stcb->asoc.sent_queue);
for (; chk != NULL; chk = tp2) {
tp2 = TAILQ_NEXT(chk, sctp_next);
@@ -693,8 +698,6 @@ start_again:
recovery_cnt++;
#ifdef INVARIANTS
panic("last acked >= chk on sent-Q");
- /* to keep compiler happy */
- goto start_again;
#else
SCTP_PRINTF("Recover attempts a restart cnt:%d\n", recovery_cnt);
sctp_recover_sent_list(stcb);
Modified: stable/7/sys/netinet/sctp_timer.h
==============================================================================
--- stable/7/sys/netinet/sctp_timer.h Thu Feb 12 18:22:11 2009 (r188526)
+++ stable/7/sys/netinet/sctp_timer.h Thu Feb 12 18:24:54 2009 (r188527)
@@ -99,8 +99,6 @@ void sctp_audit_retranmission_queue(stru
void sctp_iterator_timer(struct sctp_iterator *it);
-void sctp_recover_sent_list(struct sctp_tcb *stcb);
-
#endif
#endif
More information about the svn-src-stable-7
mailing list