From owner-freebsd-current@FreeBSD.ORG  Wed Feb 11 01:21:51 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CDAE916A4CE
	for <current@freebsd.org>; Wed, 11 Feb 2004 01:21:51 -0800 (PST)
Received: from mout.perfora.net (mout.perfora.net [217.160.230.40])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B61E143D1D
	for <current@freebsd.org>; Wed, 11 Feb 2004 01:21:51 -0800 (PST)
	(envelope-from roop@hqst.com)
Received: from [217.160.230.51] (helo=smtp.perfora.net)
	by mout.perfora.net with esmtp (Exim 3.35 #1)
	id 1AqqZ5-0004gA-00
	for current@freebsd.org; Wed, 11 Feb 2004 04:21:51 -0500
Received: from [24.82.165.92] (helo=hqst.com)
	by smtp.perfora.net with asmtp (Exim 3.35 #1)
	id 1AqqZ5-0007F8-00
	for current@FreeBSD.org; Wed, 11 Feb 2004 04:21:51 -0500
Message-ID: <4029F434.1030306@hqst.com>
Date: Wed, 11 Feb 2004 01:21:56 -0800
From: Roop Nanuwa <roop@hqst.com>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US;
	rv:1.5) Gecko/20031208 Thunderbird/0.3
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: current@FreeBSD.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [PATCH] sys/netinet/tcp_output.c compile fails on -CURRENT
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2004 09:21:51 -0000

There were some changes made to sys/netinet/tcp_output.c
for revision 1.86. If you don't have TCP_SIGNATURE enabled
then the compile fails because there's a variable 'sigoff' that's
only used inside an #ifdef TCP_SIGNATURE block. If you don't
have it enabled then the compile fails because of the warning
that the variable sigoff is declared but never used. Patch
included to get around this.

(and as I finished typing this, the current tinderbox failure
messages are coming in :) )

--roop

--- sys/netinet/tcp_output.c.orig       Wed Feb 11 00:11:28 2004
+++ sys/netinet/tcp_output.c    Wed Feb 11 00:39:37 2004
@@ -116,7 +116,9 @@
        struct socket *so = tp->t_inpcb->inp_socket;
        long len, recwin, sendwin;
        int off, flags, error;
+#ifdef TCP_SIGNATURE
        int sigoff = 0;
+#endif
        struct mbuf *m;
        struct ip *ip = NULL;
        struct ipovly *ipov = NULL;