From owner-freebsd-current@FreeBSD.ORG  Mon Sep  6 09:48:10 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 CB9BC16A4CE
	for <current@freebsd.org>; Mon,  6 Sep 2004 09:48:10 +0000 (GMT)
Received: from xorpc.icir.org (xorpc.icir.org [192.150.187.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B6B4143D4C
	for <current@freebsd.org>; Mon,  6 Sep 2004 09:48:06 +0000 (GMT)
	(envelope-from rizzo@icir.org)
Received: from xorpc.icir.org (localhost [127.0.0.1])
	by xorpc.icir.org (8.12.9p1/8.12.8) with ESMTP id i869m6Ib028651;
	Mon, 6 Sep 2004 02:48:06 -0700 (PDT)
	(envelope-from rizzo@xorpc.icir.org)
Received: (from rizzo@localhost)
	by xorpc.icir.org (8.12.9p1/8.12.3/Submit) id i869m6ca028650;
	Mon, 6 Sep 2004 02:48:06 -0700 (PDT)
	(envelope-from rizzo)
Date: Mon, 6 Sep 2004 02:48:06 -0700
From: Luigi Rizzo <rizzo@icir.org>
To: Maxim Konovalov <maxim@macomnet.ru>
Message-ID: <20040906024806.A28553@xorpc.icir.org>
References: <20040906132805.G20402@mp2.macomnet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <20040906132805.G20402@mp2.macomnet.net>;
	from maxim@macomnet.ru on Mon, Sep 06, 2004 at 01:32:55PM +0400
cc: current@freebsd.org
Subject: Re: IPFW2 #if's removal
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: Mon, 06 Sep 2004 09:48:10 -0000

On Mon, Sep 06, 2004 at 01:32:55PM +0400, Maxim Konovalov wrote:
> Hello,
> 
> An enclosed diff removes ~90 lines of "#if !IPFW2" dead code and a
> little "FreeBSD_version" snipped.  The purpose is to make the code a
> little bit easier to read and maintain.  Is it desirable to commit it
> in HEAD and MFC to RELENG_5?  Are there any objections/drawbacks?

this change makes the backport to 4.x a PITA.
Given that this is not a functional change but purely 'whitespace",
i'd postpone it to the time when we declare 4.x unsupported,
or at least 'IPFW1 on 4.x unsupported'.

If you really really need to commit something of this, please
leave the kernel part alone.

[patch omitted]

cheers
luigi