From owner-svn-src-head@FreeBSD.ORG  Mon Oct 27 13:53:31 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D943C1065671;
	Mon, 27 Oct 2008 13:53:31 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7F968FC2D;
	Mon, 27 Oct 2008 13:53:31 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RDrVKa040959;
	Mon, 27 Oct 2008 13:53:31 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9RDrVvp040957;
	Mon, 27 Oct 2008 13:53:31 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200810271353.m9RDrVvp040957@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Mon, 27 Oct 2008 13:53:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184333 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Oct 2008 13:53:32 -0000

Author: rrs
Date: Mon Oct 27 13:53:31 2008
New Revision: 184333
URL: http://svn.freebsd.org/changeset/base/184333

Log:
  Invariants changes that make more sense.

Modified:
  head/sys/netinet/sctp_timer.c
  head/sys/netinet/sctp_timer.h

Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c	Mon Oct 27 12:12:23 2008	(r184332)
+++ head/sys/netinet/sctp_timer.c	Mon Oct 27 13:53:31 2008	(r184333)
@@ -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: head/sys/netinet/sctp_timer.h
==============================================================================
--- head/sys/netinet/sctp_timer.h	Mon Oct 27 12:12:23 2008	(r184332)
+++ head/sys/netinet/sctp_timer.h	Mon Oct 27 13:53:31 2008	(r184333)
@@ -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