From patchwork Wed Feb 4 09:25:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 2945 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 86590ADC1; Wed, 4 Feb 2015 10:25:44 +0100 (CET) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by dpdk.org (Postfix) with ESMTP id AE28BADB4 for ; Wed, 4 Feb 2015 10:25:41 +0100 (CET) Received: by mail-we0-f182.google.com with SMTP id l61so500552wev.13 for ; Wed, 04 Feb 2015 01:25:40 -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=+CPnEVhIe+V9hB7FXOaxvk85gcclarwtPFd68DqTYl4=; b=dtiaM7l3iO+ASQ5iYqk6fZ2EXDjCHyod69kFAsOL3X5o5azzzqjOoXuxMnNZdAcX9w VGY6FkffMyFc7ha7fsxB6sIss6ZRkVCdEcT6DydZYviccv378vKWNtstNU0XNSxJjqHM MtL9GdgbynNLFf/m8qhimwoV28z72DK804TXDRhVRkk89n30eJt3yukAW27mCTkkaVol ET4CHUHwMtzid4JFxrsG2Rn/La2CjVFIQ22oo4a+/mqlT6cCKDY8R13u5WhieNawlNn6 CSEWNC37CP3G07eWBy5VtQ2s7ozmZFiFqaZbEjApArJx2GqI1AvSfXkvY5wptPScq7hU SKMw== X-Gm-Message-State: ALoCoQkypoB0joRj4UT5EYL4TWcjHYqQvTLV8snMzMv+KQYhR9OcBTKifrl8A7WeZSdqi8IGjIzD X-Received: by 10.180.207.83 with SMTP id lu19mr43175420wic.52.1423041940451; Wed, 04 Feb 2015 01:25:40 -0800 (PST) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id a13sm2346491wic.3.2015.02.04.01.25.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 01:25:39 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Wed, 4 Feb 2015 10:25:06 +0100 Message-Id: <1423041925-26956-2-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423041925-26956-1-git-send-email-olivier.matz@6wind.com> References: <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> <1423041925-26956-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v2 01/20] mbuf: remove PKT_TX_IPV4_CSUM 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" This alias is only used in one place of i40e driver. Remove it and only keep the legacy flag PKT_TX_IP_CSUM. Signed-off-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.h | 1 - lib/librte_pmd_i40e/i40e_rxtx.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 16059c6..a554247 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -142,7 +142,6 @@ extern "C" { #define PKT_TX_L4_MASK (3ULL << 52) /**< Mask for L4 cksum offload request. */ #define PKT_TX_IP_CKSUM (1ULL << 54) /**< IP cksum of TX pkt. computed by NIC. */ -#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ /** Packet is IPv4 without requiring IP checksum offload. */ #define PKT_TX_IPV4 (1ULL << 55) diff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c index 2beae3c..8e9df96 100644 --- a/lib/librte_pmd_i40e/i40e_rxtx.c +++ b/lib/librte_pmd_i40e/i40e_rxtx.c @@ -501,7 +501,7 @@ i40e_txd_enable_checksum(uint64_t ol_flags, << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; /* Enable L3 checksum offloads */ - if (ol_flags & PKT_TX_IPV4_CSUM) { + if (ol_flags & PKT_TX_IP_CKSUM) { *td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM; *td_offset |= (l3_len >> 2) << I40E_TX_DESC_LENGTH_IPLEN_SHIFT; } else if (ol_flags & PKT_TX_IPV4) {