From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by dpdk.org (Postfix) with ESMTP id A7C6B7F6D for ; Fri, 14 Nov 2014 17:53:45 +0100 (CET) Received: by mail-wi0-f170.google.com with SMTP id r20so74128wiv.1 for ; Fri, 14 Nov 2014 09:03:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KEmtteuiibcBbmDnSFjPASAdFxmDGF/+zvQQ2tTSJFI=; b=Fztz5I4EyZM0vfJa6EZfJic5cwaCznkKEV5egDkRuufQhZ1IW/nHS7r/mlUWTtRc29 5es+f4STGGKCRRke5OTOkxlu5qVxXcUczkfPPeDCIATh8okUJaZp3EzWji8fjC47kxLT lvRDwA0lmW+rWFvnHDeCJuRgtFC8By0V9R2njXQOZCw7JcJiMHzBpXmxxqcL8CpTgBjP p8WzrSHFmX+cQ8B5CwYuQHWLG4rfi4UhTXCi3lGvOQKXe2uOMowcOt9z9/Jv52NMMZ6P 0A/insNGEkwM2ZHzyYkzgK2tp91y/2lGMBDuKfLPTNGoygNQxkmA0MuZyhcKg2XGeUCM eNJA== X-Gm-Message-State: ALoCoQmXM/bzaChDCMtFj6STEd/7fdh2WkWEH5IvrMyvkD3eqElT2JM+9u5d0lOQxglPlTj8uKOB X-Received: by 10.180.21.210 with SMTP id x18mr9403378wie.19.1415984629517; Fri, 14 Nov 2014 09:03:49 -0800 (PST) Received: from glumotte.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id cu9sm40352554wjb.0.2014.11.14.09.03.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Nov 2014 09:03:49 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Fri, 14 Nov 2014 18:03:18 +0100 Message-Id: <1415984609-2484-3-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1415984609-2484-1-git-send-email-olivier.matz@6wind.com> References: <1415635166-1364-1-git-send-email-olivier.matz@6wind.com> <1415984609-2484-1-git-send-email-olivier.matz@6wind.com> Cc: jigsaw@gmail.com Subject: [dpdk-dev] [PATCH v2 02/13] 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: Fri, 14 Nov 2014 16:53:46 -0000 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 ecebbf6..7e470ce 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