diff options
| author | rrs <rrs@FreeBSD.org> | 2008-10-27 13:53:31 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2008-10-27 13:53:31 +0000 |
| commit | 41b5d3d96e105c0f0454db9ce17a54119886e66f (patch) | |
| tree | 9017d7cd0afd26d50ce856beb303515b95a36242 /sys | |
| parent | 49799059b1856cbe9d24536227d4c2b1f238c030 (diff) | |
| download | FreeBSD-src-41b5d3d96e105c0f0454db9ce17a54119886e66f.zip FreeBSD-src-41b5d3d96e105c0f0454db9ce17a54119886e66f.tar.gz | |
Invariants changes that make more sense.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/sctp_timer.c | 9 | ||||
| -rw-r--r-- | sys/netinet/sctp_timer.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index c86edf9..28661c2 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -561,7 +561,8 @@ sctp_backoff_on_timeout(struct sctp_tcb *stcb, } } -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 *stcb) } } +#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 *stcb, /* 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); diff --git a/sys/netinet/sctp_timer.h b/sys/netinet/sctp_timer.h index 9743abf..c3b3188 100644 --- a/sys/netinet/sctp_timer.h +++ b/sys/netinet/sctp_timer.h @@ -99,8 +99,6 @@ void sctp_audit_retranmission_queue(struct sctp_association *); void sctp_iterator_timer(struct sctp_iterator *it); -void sctp_recover_sent_list(struct sctp_tcb *stcb); - #endif #endif |
