Date: Fri, 18 Feb 2011 23:47:59 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r218829 - projects/pf/pf45/sys/contrib/altq/altq Message-ID: <201102182347.p1INlxAf076943@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102182347.p1INlxAf076943>