kern/121108: [ipfw] [patch] add support to ToS IP PRECEDENCE fields

[Maxim Konovalov]

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

From: Maxim Konovalov <maxim at macomnet.ru>
To: "Marcelo Araujo (araujo at FreeBSD.org)" <araujo at freebsd.org>
Cc: bug-followup at 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