From owner-cvs-src@FreeBSD.ORG Thu Aug 28 16:36:21 2008 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 026A2106568A; Thu, 28 Aug 2008 16:36:21 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id 6B7018FC24; Thu, 28 Aug 2008 16:36:20 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from kobe.laptop (adsl156-107.kln.forthnet.gr [62.1.247.107]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-5) with ESMTP id m7SGa71k012169 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 28 Aug 2008 19:36:13 +0300 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.2/8.14.2) with ESMTP id m7SGa7UT082925; Thu, 28 Aug 2008 19:36:07 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) Received: (from keramida@localhost) by kobe.laptop (8.14.2/8.14.2/Submit) id m7SGa7wQ082920; Thu, 28 Aug 2008 19:36:07 +0300 (EEST) (envelope-from keramida@ceid.upatras.gr) From: Giorgos Keramidas To: Randall Stewart References: <200808280944.m7S9iN4x065836@repoman.freebsd.org> <87wsi1glaj.fsf@kobe.laptop> Date: Thu, 28 Aug 2008 19:36:07 +0300 In-Reply-To: <87wsi1glaj.fsf@kobe.laptop> (Giorgos Keramidas's message of "Thu, 28 Aug 2008 19:24:20 +0300") Message-ID: <87skspgkqw.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-MailScanner-ID: m7SGa71k012169 X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-4.001, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.40, BAYES_00 -2.60) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-Spam-Status: No Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/netinet sctp_indata.c sctp_lock_bsd.h sctp_output.c sctp_sysctl.h sctp_timer.c sctp_var.h sctputil.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2008 16:36:21 -0000 On Thu, 28 Aug 2008 19:24:20 +0300, Giorgos Keramidas wrote: > I think we also need this patch: > > %%% > diff -r 2e31e006d558 sys/netinet/sctp_timer.c > --- a/sys/netinet/sctp_timer.c Thu Aug 28 17:36:53 2008 +0300 > +++ b/sys/netinet/sctp_timer.c Thu Aug 28 19:22:04 2008 +0300 > @@ -679,7 +679,9 @@ > /* Now on to each chunk */ > num_mk = cnt_mk = 0; > tsnfirst = tsnlast = 0; > +#ifdef INVARIANTS > start_again: > +#endif > chk = TAILQ_FIRST(&stcb->asoc.sent_queue); > for (; chk != NULL; chk = tp2) { > tp2 = TAILQ_NEXT(chk, sctp_next); > %%% This #ifdef is reversed, my apologies... A better patch, that also hides sctp_recover_sent_list() behind #ifndef INVARIANTS (it is an unused static function in the INVARIANTS case), is attached below: %%% -------------------------------------------------------------------- diff -r 2e31e006d558 sys/netinet/sctp_timer.c --- a/sys/netinet/sctp_timer.c Thu Aug 28 17:36:53 2008 +0300 +++ b/sys/netinet/sctp_timer.c Thu Aug 28 19:33:29 2008 +0300 @@ -561,6 +561,7 @@ sctp_backoff_on_timeout(struct sctp_tcb } } +#ifndef INVARIANTS static void sctp_recover_sent_list(struct sctp_tcb *stcb) { @@ -603,6 +604,7 @@ sctp_recover_sent_list(struct sctp_tcb * SCTP_PRINTF("chk:%p TSN:%x\n", chk, chk->rec.data.TSN_seq); } } +#endif static int sctp_mark_all_for_resend(struct sctp_tcb *stcb, @@ -679,7 +681,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); %%% -------------------------------------------------------------------- With these changes, I can build a HEAD kernel again :)