From owner-svn-src-stable@FreeBSD.ORG  Thu Feb 12 18:24:54 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DEE1B106564A;
	Thu, 12 Feb 2009 18:24:54 +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 CCD6A8FC18;
	Thu, 12 Feb 2009 18:24:54 +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 n1CIOs4j063578;
	Thu, 12 Feb 2009 18:24:54 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1CIOsTm063576;
	Thu, 12 Feb 2009 18:24:54 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200902121824.n1CIOsTm063576@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Thu, 12 Feb 2009 18:24:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188527 - in stable/7/sys: . netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2009 18:24:55 -0000

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