From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 442C0234 for ; Wed, 11 Feb 2015 15:58:23 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 11 Feb 2015 06:58:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,559,1418112000"; d="scan'208";a="526014583" Received: from dwdohert-dpdk-fedora-20.ir.intel.com ([163.33.213.98]) by orsmga003.jf.intel.com with ESMTP; 11 Feb 2015 06:50:10 -0800 Message-ID: <54DB6EB7.6000207@intel.com> Date: Wed, 11 Feb 2015 15:01:11 +0000 From: Declan Doherty User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Helin Zhang , dev@dpdk.org References: <1421637666-16872-1-git-send-email-helin.zhang@intel.com> <1422501365-12643-1-git-send-email-helin.zhang@intel.com> <1422501365-12643-7-git-send-email-helin.zhang@intel.com> In-Reply-To: <1422501365-12643-7-git-send-email-helin.zhang@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH 06/17] bond: support of unified packet type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2015 14:58:23 -0000 On 29/01/15 03:15, Helin Zhang wrote: > To unify packet types among all PMDs, bit masks of packet type for > ol_flags are replaced by unified packet type. > > Signed-off-by: Helin Zhang > --- > lib/librte_pmd_bond/rte_eth_bond_pmd.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c b/lib/librte_pmd_bond/rte_eth_bond_pmd.c > index 8b80297..acd8e77 100644 > --- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c > +++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c > @@ -319,12 +319,11 @@ xmit_l23_hash(const struct rte_mbuf *buf, uint8_t slave_count) > > hash = ether_hash(eth_hdr); > > - if (buf->ol_flags & PKT_RX_IPV4_HDR) { > + if (RTE_ETH_IS_IPV4_HDR(buf->packet_type)) { > struct ipv4_hdr *ipv4_hdr = (struct ipv4_hdr *) > ((char *)(eth_hdr + 1) + vlan_offset); > l3hash = ipv4_hash(ipv4_hdr); > - > - } else if (buf->ol_flags & PKT_RX_IPV6_HDR) { > + } else if (RTE_ETH_IS_IPV6_HDR(buf->packet_type)) { > struct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *) > ((char *)(eth_hdr + 1) + vlan_offset); > l3hash = ipv6_hash(ipv6_hdr); > @@ -346,7 +345,7 @@ xmit_l34_hash(const struct rte_mbuf *buf, uint8_t slave_count) > struct tcp_hdr *tcp_hdr = NULL; > uint32_t hash, l3hash = 0, l4hash = 0; > > - if (buf->ol_flags & PKT_RX_IPV4_HDR) { > + if (RTE_ETH_IS_IPV4_HDR(buf->packet_type)) { > struct ipv4_hdr *ipv4_hdr = (struct ipv4_hdr *) > ((char *)(eth_hdr + 1) + vlan_offset); > size_t ip_hdr_offset; > @@ -365,7 +364,7 @@ xmit_l34_hash(const struct rte_mbuf *buf, uint8_t slave_count) > ip_hdr_offset); > l4hash = HASH_L4_PORTS(udp_hdr); > } > - } else if (buf->ol_flags & PKT_RX_IPV6_HDR) { > + } else if (RTE_ETH_IS_IPV6_HDR(buf->packet_type)) { > struct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *) > ((char *)(eth_hdr + 1) + vlan_offset); > l3hash = ipv6_hash(ipv6_hdr); > Hey Helin, this patch should no longer be necessary as commit # bffc9b35e3acd70895b73616c850d8d37fe5732e removed all references to the ol_flags in the link bonding code. Declan