From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 25098592B for ; Fri, 22 May 2015 10:44:50 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 22 May 2015 01:44:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,474,1427785200"; d="scan'208";a="733604750" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga002.jf.intel.com with ESMTP; 22 May 2015 01:44:48 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t4M8ike6025046; Fri, 22 May 2015 16:44:46 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id t4M8ihYF017459; Fri, 22 May 2015 16:44:45 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t4M8igrq017455; Fri, 22 May 2015 16:44:42 +0800 From: Helin Zhang To: dev@dpdk.org Date: Fri, 22 May 2015 16:44:13 +0800 Message-Id: <1432284264-17376-8-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1432284264-17376-1-git-send-email-helin.zhang@intel.com> References: <1425042696-23162-1-git-send-email-helin.zhang@intel.com> <1432284264-17376-1-git-send-email-helin.zhang@intel.com> Subject: [dpdk-dev] [PATCH v5 07/18] enic: replace bit mask based packet type with 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: Fri, 22 May 2015 08:44:50 -0000 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_enic/enic_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) v2 changes: * Used redefined packet types and enlarged packet_type field in mbuf. v5 changes: * Re-worded the commit logs. diff --git a/lib/librte_pmd_enic/enic_main.c b/lib/librte_pmd_enic/enic_main.c index 15313c2..da52003 100644 --- a/lib/librte_pmd_enic/enic_main.c +++ b/lib/librte_pmd_enic/enic_main.c @@ -423,7 +423,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->pkt_len = bytes_written; if (ipv4) { - rx_pkt->ol_flags |= PKT_RX_IPV4_HDR; + rx_pkt->packet_type = RTE_PTYPE_L3_IPV4; if (!csum_not_calc) { if (unlikely(!ipv4_csum_ok)) rx_pkt->ol_flags |= PKT_RX_IP_CKSUM_BAD; @@ -432,7 +432,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, rx_pkt->ol_flags |= PKT_RX_L4_CKSUM_BAD; } } else if (ipv6) - rx_pkt->ol_flags |= PKT_RX_IPV6_HDR; + rx_pkt->packet_type = RTE_PTYPE_L3_IPV6; } else { /* Header split */ if (sop && !eop) { @@ -445,7 +445,7 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, *rx_pkt_bucket = rx_pkt; rx_pkt->pkt_len = bytes_written; if (ipv4) { - rx_pkt->ol_flags |= PKT_RX_IPV4_HDR; + rx_pkt->packet_type = RTE_PTYPE_L3_IPV4; if (!csum_not_calc) { if (unlikely(!ipv4_csum_ok)) rx_pkt->ol_flags |= @@ -457,13 +457,14 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, PKT_RX_L4_CKSUM_BAD; } } else if (ipv6) - rx_pkt->ol_flags |= PKT_RX_IPV6_HDR; + rx_pkt->packet_type = RTE_PTYPE_L3_IPV6; } else { /* Payload */ hdr_rx_pkt = *rx_pkt_bucket; hdr_rx_pkt->pkt_len += bytes_written; if (ipv4) { - hdr_rx_pkt->ol_flags |= PKT_RX_IPV4_HDR; + hdr_rx_pkt->packet_type = + RTE_PTYPE_L3_IPV4; if (!csum_not_calc) { if (unlikely(!ipv4_csum_ok)) hdr_rx_pkt->ol_flags |= @@ -475,7 +476,8 @@ static int enic_rq_indicate_buf(struct vnic_rq *rq, PKT_RX_L4_CKSUM_BAD; } } else if (ipv6) - hdr_rx_pkt->ol_flags |= PKT_RX_IPV6_HDR; + hdr_rx_pkt->packet_type = + RTE_PTYPE_L3_IPV6; } } -- 1.9.3