From owner-freebsd-bugs@FreeBSD.ORG Sun Feb 19 18:20:08 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 477F4106564A for ; Sun, 19 Feb 2012 18:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1474E8FC1A for ; Sun, 19 Feb 2012 18:20:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q1JIK72W094417 for ; Sun, 19 Feb 2012 18:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q1JIK7Ej094416; Sun, 19 Feb 2012 18:20:07 GMT (envelope-from gnats) Date: Sun, 19 Feb 2012 18:20:07 GMT Message-Id: <201202191820.q1JIK7Ej094416@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org From: rozhuk.im@gmail.com Cc: Subject: Re: kern/165296: Fix EVL_APPLY_VLID, update EVL_APPLY_PRI macro X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: rozhuk.im@gmail.com List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2012 18:20:08 -0000 The following reply was made to PR kern/165296; it has been noted by GNATS. From: rozhuk.im@gmail.com To: , Cc: Subject: Re: kern/165296: Fix EVL_APPLY_VLID, update EVL_APPLY_PRI macro Date: Mon, 20 Feb 2012 03:16:00 +0900 This is a multi-part message in MIME format. ------=_NextPart_000_0046_01CCEF7D.FB03C320 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit - (m)->m_pkthdr.ether_vtag |= (((pri) & 7) << 1); \ + (m)->m_pkthdr.ether_vtag |= (((pri) & 7) << 13); \ ------=_NextPart_000_0046_01CCEF7D.FB03C320 Content-Type: application/octet-stream; name="if_vlan_var.h.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="if_vlan_var.h.patch" --- ./if_vlan_var.h.orig 2011-09-23 09:51:37.000000000 +0900=0A= +++ ./if_vlan_var.h 2012-02-20 03:11:20.000000000 +0900=0A= @@ -52,27 +52,24 @@=0A= #define EVL_APPLY_VLID(m, vlid) \=0A= do { \=0A= if ((m)->m_flags & M_VLANTAG) { \=0A= - (m)->m_pkthdr.ether_vtag &=3D EVL_VLID_MASK; \=0A= - (m)->m_pkthdr.ether_vtag |=3D (vlid); \=0A= + (m)->m_pkthdr.ether_vtag &=3D ~EVL_VLID_MASK; \=0A= } else { \=0A= - (m)->m_pkthdr.ether_vtag =3D (vlid); \=0A= + (m)->m_pkthdr.ether_vtag =3D 0; \=0A= (m)->m_flags |=3D M_VLANTAG; \=0A= } \=0A= + (m)->m_pkthdr.ether_vtag |=3D ((vlid) & EVL_VLID_MASK); \=0A= } while (0)=0A= =0A= /* Set the priority ID in an mbuf packet header non-destructively. */=0A= #define EVL_APPLY_PRI(m, pri) \=0A= do { \=0A= if ((m)->m_flags & M_VLANTAG) { \=0A= - uint16_t __vlantag =3D (m)->m_pkthdr.ether_vtag; \=0A= - (m)->m_pkthdr.ether_vtag |=3D EVL_MAKETAG( \=0A= - EVL_VLANOFTAG(__vlantag), (pri), \=0A= - EVL_CFIOFTAG(__vlantag)); \=0A= + (m)->m_pkthdr.ether_vtag &=3D ~EVL_PRI_MASK; \=0A= } else { \=0A= - (m)->m_pkthdr.ether_vtag =3D \=0A= - EVL_MAKETAG(0, (pri), 0); \=0A= + (m)->m_pkthdr.ether_vtag =3D 0; \=0A= (m)->m_flags |=3D M_VLANTAG; \=0A= } \=0A= + (m)->m_pkthdr.ether_vtag |=3D (((pri) & 7) << 13); \=0A= } while (0)=0A= =0A= /* sysctl(3) tags, for compatibility purposes */=0A= ------=_NextPart_000_0046_01CCEF7D.FB03C320--