From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 42D4E7F30 for ; Mon, 10 Nov 2014 17:50:07 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 10 Nov 2014 08:57:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,353,1413270000"; d="scan'208";a="634544106" Received: from ppfinner-mobl3.ger.corp.intel.com ([10.252.17.162]) by orsmga002.jf.intel.com with SMTP; 10 Nov 2014 08:59:49 -0800 Received: by (sSMTP sendmail emulation); Mon, 10 Nov 2014 16:59:48 +0025 Date: Mon, 10 Nov 2014 16:59:48 +0000 From: Bruce Richardson To: Olivier Matz Message-ID: <20141110165948.GB10776@bricha3-MOBL3> References: <1415635166-1364-1-git-send-email-olivier.matz@6wind.com> <1415635166-1364-3-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-3-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 02/12] ixgbe: fix remaining pkt_flags variable size to 64 bits 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 16:50:07 -0000 On Mon, Nov 10, 2014 at 04:59:16PM +0100, Olivier Matz wrote: > Since commit 4332beee9 "mbuf: expand ol_flags field to 64-bits", the > packet flags are now 64 bits wide. Some occurences were forgotten in > the ixgbe driver. > > Signed-off-by: Olivier Matz Acked-by: Bruce Richardson > --- > lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > index 78be7e6..042ee8a 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > @@ -817,7 +817,7 @@ end_of_tx: > static inline uint64_t > rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs) > { > - uint16_t pkt_flags; > + uint64_t pkt_flags; > > static uint64_t ip_pkt_types_map[16] = { > 0, PKT_RX_IPV4_HDR, PKT_RX_IPV4_HDR_EXT, PKT_RX_IPV4_HDR_EXT, > @@ -834,7 +834,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs) > }; > > #ifdef RTE_LIBRTE_IEEE1588 > - static uint32_t ip_pkt_etqf_map[8] = { > + static uint64_t ip_pkt_etqf_map[8] = { > 0, 0, 0, PKT_RX_IEEE1588_PTP, > 0, 0, 0, 0, > }; > @@ -903,7 +903,7 @@ ixgbe_rx_scan_hw_ring(struct igb_rx_queue *rxq) > struct igb_rx_entry *rxep; > struct rte_mbuf *mb; > uint16_t pkt_len; > - uint16_t pkt_flags; > + uint64_t pkt_flags; > int s[LOOK_AHEAD], nb_dd; > int i, j, nb_rx = 0; > > @@ -1335,7 +1335,7 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, > uint16_t nb_rx; > uint16_t nb_hold; > uint16_t data_len; > - uint16_t pkt_flags; > + uint64_t pkt_flags; > > nb_rx = 0; > nb_hold = 0; > @@ -1511,9 +1511,9 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, > first_seg->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan); > hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data); > pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss); > - pkt_flags = (uint16_t)(pkt_flags | > + pkt_flags = (pkt_flags | > rx_desc_status_to_pkt_flags(staterr)); > - pkt_flags = (uint16_t)(pkt_flags | > + pkt_flags = (pkt_flags | > rx_desc_error_to_pkt_flags(staterr)); > first_seg->ol_flags = pkt_flags; > > -- > 2.1.0 >