From patchwork Thu Jul 9 16:31:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Helin" X-Patchwork-Id: 6253 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 26157C38A; Thu, 9 Jul 2015 18:32:18 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 058A0C394 for ; Thu, 9 Jul 2015 18:32:13 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 09 Jul 2015 09:32:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,441,1432623600"; d="scan'208";a="603113618" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga003.jf.intel.com with ESMTP; 09 Jul 2015 09:32:12 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t69GW9LQ005457; Fri, 10 Jul 2015 00:32:09 +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 t69GW5r9014272; Fri, 10 Jul 2015 00:32:07 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t69GW56c014268; Fri, 10 Jul 2015 00:32:05 +0800 From: Helin Zhang To: dev@dpdk.org Date: Fri, 10 Jul 2015 00:31:31 +0800 Message-Id: <1436459501-14173-10-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1436459501-14173-1-git-send-email-helin.zhang@intel.com> References: <1435912347-19499-1-git-send-email-helin.zhang@intel.com> <1436459501-14173-1-git-send-email-helin.zhang@intel.com> Subject: [dpdk-dev] [PATCH v10 09/19] cxgbe: 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To unify packet types among all PMDs, bit masks of packet type for 'ol_flags' are replaced by unified packet type. To avoid breaking ABI compatibility, all the changes would be enabled by RTE_NEXT_ABI, which is disabled by default. Signed-off-by: Helin Zhang --- drivers/net/cxgbe/sge.c | 8 ++++++++ 1 file changed, 8 insertions(+) v9 changes: * Added unified packet type support in newly added cxgbe driver. diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c index 359296e..fdae0b4 100644 --- a/drivers/net/cxgbe/sge.c +++ b/drivers/net/cxgbe/sge.c @@ -1326,14 +1326,22 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, mbuf->port = pkt->iff; if (pkt->l2info & htonl(F_RXF_IP)) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type = RTE_PTYPE_L3_IPV4; +#else mbuf->ol_flags |= PKT_RX_IPV4_HDR; +#endif if (unlikely(!csum_ok)) mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; if ((pkt->l2info & htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; } else if (pkt->l2info & htonl(F_RXF_IP6)) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type = RTE_PTYPE_L3_IPV6; +#else mbuf->ol_flags |= PKT_RX_IPV6_HDR; +#endif } mbuf->port = pkt->iff;