From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 18 23:47:59 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 370CD1065673;
	Fri, 18 Feb 2011 23:47:59 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 273DA8FC0C;
	Fri, 18 Feb 2011 23:47:59 +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 p1INlxAk076945;
	Fri, 18 Feb 2011 23:47:59 GMT (envelope-from eri@svn.freebsd.org)
Received: (from eri@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1INlxAf076943;
	Fri, 18 Feb 2011 23:47:59 GMT (envelope-from eri@svn.freebsd.org)
Message-Id: <201102182347.p1INlxAf076943@svn.freebsd.org>
From: Ermal Luçi <eri@FreeBSD.org>
Date: Fri, 18 Feb 2011 23:47:59 +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: r218829 - 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: Fri, 18 Feb 2011 23:47:59 -0000

Author: eri
Date: Fri Feb 18 23:47:58 2011
New Revision: 218829
URL: http://svn.freebsd.org/changeset/base/218829

Log:
  Fix compiling ALTQ_REQ/ALTQ_RIO/ALTQ_ECN options.

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	Fri Feb 18 23:18:08 2011	(r218828)
+++ projects/pf/pf45/sys/contrib/altq/altq/altq_red.c	Fri Feb 18 23:47:58 2011	(r218829)
@@ -516,11 +516,9 @@ mark_ecn(struct mbuf *m, struct altq_pkt
 	struct mbuf	*m0;
 	struct pf_mtag	*at;
 	void		*hdr;
-	int		 af;
 
 	at = pf_find_mtag(m);
 	if (at != NULL) {
-		af = at->af;
 		hdr = at->hdr;
 #ifdef ALTQ3_COMPAT
 	} else if (pktattr != NULL) {
@@ -530,9 +528,6 @@ mark_ecn(struct mbuf *m, struct altq_pkt
 	} else
 		return (0);
 
-	if (af != AF_INET && af != AF_INET6)
-		return (0);
-
 	/* verify that pattr_hdr is within the mbuf data */
 	for (m0 = m; m0 != NULL; m0 = m0->m_next)
 		if (((caddr_t)hdr >= m0->m_data) &&
@@ -543,8 +538,8 @@ mark_ecn(struct mbuf *m, struct altq_pkt
 		return (0);
 	}
 
-	switch (af) {
-	case AF_INET:
+	switch (((struct ip *)hdr)->ip_v) {
+	case IPVERSION:
 		if (flags & REDF_ECN4) {
 			struct ip *ip = hdr;
 			u_int8_t otos;
@@ -577,7 +572,7 @@ mark_ecn(struct mbuf *m, struct altq_pkt
 		}
 		break;
 #ifdef INET6
-	case AF_INET6:
+	case 6:
 		if (flags & REDF_ECN6) {
 			struct ip6_hdr *ip6 = hdr;
 			u_int32_t flowlabel;