From owner-cvs-src@FreeBSD.ORG  Fri Dec 24 23:15:37 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E4D0A16A4CE; Fri, 24 Dec 2004 23:15:37 +0000 (GMT)
Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5997443D3F; Fri, 24 Dec 2004 23:15:37 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from [192.168.254.11] (junior-wifi.samsco.home [192.168.254.11])
	(authenticated bits=0)
	by pooker.samsco.org (8.12.11/8.12.10) with ESMTP id iBONJJmA094994;
	Fri, 24 Dec 2004 16:19:19 -0700 (MST)
	(envelope-from scottl@freebsd.org)
Message-ID: <41CCA2CC.6080408@freebsd.org>
Date: Fri, 24 Dec 2004 16:14:20 -0700
From: Scott Long <scottl@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.2) Gecko/20040929
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Giorgos Keramidas <keramida@ceid.upatras.gr>
References: <200412240914.iBO9EQwi030378@repoman.freebsd.org>
	<41CC8E1E.3020809@freebsd.org> <20041224231120.GA70659@gothmog.gr>
In-Reply-To: <20041224231120.GA70659@gothmog.gr>
X-Enigmail-Version: 0.86.1.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, hits=0.1 required=3.8 tests=EXCUSE_3 autolearn=no 
	version=2.63
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on pooker.samsco.org
cc: Darren Reed <darrenr@freebsd.org>
cc: cvs-src@freebsd.org
cc: src-committers@freebsd.org
cc: cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/contrib/ipfilter/netinetip_auth.cip_compat.h
 ip_frag.c ip_log.c ip_nat.h ip_proxy.c ip_state.c ip_state.h mlfk_ipl.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Dec 2004 23:15:38 -0000

Giorgos Keramidas wrote:
> On 2004-12-24 14:46, Scott Long <scottl@freebsd.org> wrote:
> 
>>Darren Reed wrote:
>>
>>>darrenr     2004-12-24 09:14:26 UTC
>>>
>>> FreeBSD src repository
>>>
>>> Modified files:
>>>   sys/contrib/ipfilter/netinet ip_auth.c ip_compat.h ip_frag.c
>>>                                ip_log.c ip_nat.h ip_proxy.c
>>>                                ip_state.c ip_state.h mlfk_ipl.c
>>> Log:
>>> Enable fine grained locking within IPFilter, using mtx(9) and sx(9)
>>> allowing
>>> the the "needs giant" flag to be removed from the driver.
>>
>>I'm not sure how this could possibly compile on FreeBSD.  Did you forget
>>to check in a file perhaps?  Please fix this ASAP, otherwise it's going
>>to get reverted.
> 
> 
> Hi Scott,
> 
> can you test this as a fix for the build problems?  It seems to fix the
> buildkernel issues here.  The arbitrary choise of __FreeBSD_version's
> value was based on this snippet from src/sys/ipfilter/netinet/ip_compat.h:

Thanks, I'll test it in a few minutes.  Would you also be willing to fix
the warning from PFIL_HOOKS being redefined?

Scott