From owner-freebsd-bugs@FreeBSD.ORG  Tue Feb 26 12:00:02 2008
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8AB9106567D
	for <freebsd-bugs@hub.freebsd.org>;
	Tue, 26 Feb 2008 12:00:02 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id BAAF113C4F8
	for <freebsd-bugs@hub.freebsd.org>;
	Tue, 26 Feb 2008 12:00:02 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m1QC02Eh087949
	for <freebsd-bugs@freefall.freebsd.org>; Tue, 26 Feb 2008 12:00:02 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m1QC02qU087948;
	Tue, 26 Feb 2008 12:00:02 GMT (envelope-from gnats)
Date: Tue, 26 Feb 2008 12:00:02 GMT
Message-Id: <200802261200.m1QC02qU087948@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Maxim Konovalov <maxim@macomnet.ru>
Cc: 
Subject: Re: kern/121108: [ipfw] [patch] add support to ToS IP PRECEDENCE
 fields
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Maxim Konovalov <maxim@macomnet.ru>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Feb 2008 12:00:02 -0000

The following reply was made to PR kern/121108; it has been noted by GNATS.

From: Maxim Konovalov <maxim@macomnet.ru>
To: "Marcelo Araujo (araujo@FreeBSD.org)" <araujo@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: kern/121108: [ipfw] [patch] add support to ToS IP PRECEDENCE
 fields
Date: Tue, 26 Feb 2008 12:54:44 +0300 (MSK)

 Hello,
 
 it seems your patch has some conflict deltas.  E.g. the following
 delta looks weird:
 
 +<<<<<<< ipfw2.c
 +       /* Setting ToS PRECEDENCE fields. */
 +       case TOK_SETIPTOSPRE:
 +               NEED1("need iptospre arg\n");
 +               fill_flags(action, O_SETIPTOSPRE, f_iptospre, *av);
 +               ac--; av++;
 +               break;
 +       /* Setting ToS PRECEDENCE fields. */
 +
 +=======
         case TOK_NAT:
                 action->opcode = O_NAT;
                 action->len = F_INSN_SIZE(ipfw_insn_nat);
                 goto chkarg;
 +>>>>>>> 1.117
 
 And it would be nice if you use english in comments :-)
 
 -- 
 Maxim Konovalov