From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id B706A7F2C for ; Mon, 10 Nov 2014 18:05:27 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 10 Nov 2014 09:14:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,353,1413270000"; d="scan'208";a="620055465" Received: from ppfinner-mobl3.ger.corp.intel.com ([10.252.17.162]) by fmsmga001.fm.intel.com with SMTP; 10 Nov 2014 09:14:27 -0800 Received: by (sSMTP sendmail emulation); Mon, 10 Nov 2014 17:14:26 +0025 Date: Mon, 10 Nov 2014 17:14:26 +0000 From: Bruce Richardson To: Olivier Matz Message-ID: <20141110171426.GE10776@bricha3-MOBL3> References: <1415635166-1364-1-git-send-email-olivier.matz@6wind.com> <1415635166-1364-6-git-send-email-olivier.matz@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1415635166-1364-6-git-send-email-olivier.matz@6wind.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: jigsaw@gmail.com, dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH 05/12] mbuf: remove too specific PKT_TX_OFFLOAD_MASK definition 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: Mon, 10 Nov 2014 17:05:28 -0000 On Mon, Nov 10, 2014 at 04:59:19PM +0100, Olivier Matz wrote: > This definition is specific to Intel PMD drivers and its definition > "indicate what bits required for building TX context" shows that it > should not be in the generic rte_mbuf.h but in the PMD driver. > > Signed-off-by: Olivier Matz > --- > lib/librte_mbuf/rte_mbuf.h | 5 ----- > lib/librte_pmd_e1000/igb_rxtx.c | 3 ++- > lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 3 ++- > 3 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index 96e322b..ff11b84 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -129,11 +129,6 @@ extern "C" { > /* Use final bit of flags to indicate a control mbuf */ > #define CTRL_MBUF_FLAG (1ULL << 63) /**< Mbuf contains control data */ > > -/** > - * Bit Mask to indicate what bits required for building TX context > - */ > -#define PKT_TX_OFFLOAD_MASK (PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | PKT_TX_L4_MASK) > - > /* define a set of marker types that can be used to refer to set points in the > * mbuf */ > typedef void *MARKER[0]; /**< generic marker for a point in a structure */ > diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c > index 321493e..dbf5074 100644 > --- a/lib/librte_pmd_e1000/igb_rxtx.c > +++ b/lib/librte_pmd_e1000/igb_rxtx.c > @@ -400,7 +400,8 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, > ol_flags = tx_pkt->ol_flags; > vlan_macip_lens.f.vlan_tci = tx_pkt->vlan_tci; > vlan_macip_lens.f.l2_l3_len = tx_pkt->l2_l3_len; > - tx_ol_req = ol_flags & PKT_TX_OFFLOAD_MASK; > + tx_ol_req = ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | > + PKT_TX_L4_MASK); > Rather than make the change like this, might it be clearer just to copy-paste the macro definition into this file (perhaps as IGB_TX_OFFLOAD_MASK). Similarly with ixgbe below? /Bruce > /* If a Context Descriptor need be built . */ > if (tx_ol_req) { > diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > index 042ee8a..70ca254 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > @@ -580,7 +580,8 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, > ol_flags = tx_pkt->ol_flags; > > /* If hardware offload required */ > - tx_ol_req = ol_flags & PKT_TX_OFFLOAD_MASK; > + tx_ol_req = ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | > + PKT_TX_L4_MASK); > if (tx_ol_req) { > vlan_macip_lens.f.vlan_tci = tx_pkt->vlan_tci; > vlan_macip_lens.f.l2_l3_len = tx_pkt->l2_l3_len; > -- > 2.1.0 >