From owner-svn-src-head@FreeBSD.ORG  Sun Jun  1 20:19:18 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 74268B04;
 Sun,  1 Jun 2014 20:19:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 61A2F2D12;
 Sun,  1 Jun 2014 20:19:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51KJIuL056887;
 Sun, 1 Jun 2014 20:19:18 GMT (envelope-from hiren@svn.freebsd.org)
Received: (from hiren@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51KJIh3056886;
 Sun, 1 Jun 2014 20:19:18 GMT (envelope-from hiren@svn.freebsd.org)
Message-Id: <201406012019.s51KJIh3056886@svn.freebsd.org>
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Sun, 1 Jun 2014 20:19:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266955 - head/sys/netpfil/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jun 2014 20:19:18 -0000

Author: hiren
Date: Sun Jun  1 20:19:17 2014
New Revision: 266955
URL: http://svnweb.freebsd.org/changeset/base/266955

Log:
  DNOLD_IS_ECN introduced by r266941 is not required.
  DNOLD_* flags are for compat with old binaries.
  
  Suggested by: luigi

Modified:
  head/sys/netpfil/ipfw/ip_dn_glue.c

Modified: head/sys/netpfil/ipfw/ip_dn_glue.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_dn_glue.c	Sun Jun  1 20:08:37 2014	(r266954)
+++ head/sys/netpfil/ipfw/ip_dn_glue.c	Sun Jun  1 20:19:17 2014	(r266955)
@@ -83,7 +83,6 @@ struct dn_flow_set {
 #define DNOLD_QSIZE_IS_BYTES   0x0008  /* queue size is measured in bytes */
 #define DNOLD_NOERROR      0x0010  /* do not report ENOBUFS on drops  */
 #define DNOLD_HAS_PROFILE      0x0020  /* the pipe has a delay profile. */
-#define DNOLD_IS_ECN       0x0040
 #define DNOLD_IS_PIPE      0x4000
 #define DNOLD_IS_QUEUE     0x8000
 
@@ -339,8 +338,6 @@ convertflags2new(int src)
 		dst |= DN_IS_RED;
 	if (src & DNOLD_IS_GENTLE_RED)
 		dst |= DN_IS_GENTLE_RED;
-	if (src & DNOLD_IS_ECN)
-		dst |= DN_IS_ECN;
 	if (src & DNOLD_HAS_PROFILE)
 		dst |= DN_HAS_PROFILE;