From owner-svn-src-projects@FreeBSD.ORG  Sat Feb 19 17:09:26 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC965106564A;
	Sat, 19 Feb 2011 17:09:26 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AC76C8FC12;
	Sat, 19 Feb 2011 17:09:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1JH9Q2X003318;
	Sat, 19 Feb 2011 17:09:26 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1JH9Q02003316;
	Sat, 19 Feb 2011 17:09:26 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201102191709.p1JH9Q02003316@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 19 Feb 2011 17:09:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218856 - projects/pf/pf45/sys/contrib/altq/altq
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Feb 2011 17:09:26 -0000

Author: bz
Date: Sat Feb 19 17:09:26 2011
New Revision: 218856
URL: http://svn.freebsd.org/changeset/base/218856

Log:
  Use the "magic constant" we use elsewhere in the tree in the switch,
  rather than just the plain number for IP version 6.

Modified:
  projects/pf/pf45/sys/contrib/altq/altq/altq_red.c

Modified: projects/pf/pf45/sys/contrib/altq/altq/altq_red.c
==============================================================================
--- projects/pf/pf45/sys/contrib/altq/altq/altq_red.c	Sat Feb 19 15:22:06 2011	(r218855)
+++ projects/pf/pf45/sys/contrib/altq/altq/altq_red.c	Sat Feb 19 17:09:26 2011	(r218856)
@@ -572,7 +572,7 @@ mark_ecn(struct mbuf *m, struct altq_pkt
 		}
 		break;
 #ifdef INET6
-	case 6:
+	case (IPV6_VERSION >> 4):
 		if (flags & REDF_ECN6) {
 			struct ip6_hdr *ip6 = hdr;
 			u_int32_t flowlabel;