From patchwork Fri Feb 13 09:22:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 3278 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 3150BB33F; Fri, 13 Feb 2015 10:23:05 +0100 (CET) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by dpdk.org (Postfix) with ESMTP id 964AAADDD for ; Fri, 13 Feb 2015 10:23:02 +0100 (CET) Received: by mail-wi0-f181.google.com with SMTP id r20so10575049wiv.2 for ; Fri, 13 Feb 2015 01:23:02 -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=kwzYLg04PfEuoLfnaztzpWGlBS/+cNOZg3KsAriJr9z5nUotDhvi2/l/MZlGwSbYgY pMzAbs5I6HvTtuX9yU6Ollntq8yM9+vjZg4lJiaPbmDFiKCeGZQcm+V4BCu0gkH5pmXw qkUnwsgm6qzf7sXPKOljMJ5/PbOv+Lke06LFK9NISHyLSXSRuHaKYhM2ISz82cBnF/LG JiVEzHqki53Zse984Z0O20OUN9he7LYVGgDOHquts1fdpaE6I8+5Cv8vJ5GNs6kWDV3z QVwIQ7oodcbOnsEdzp7qh/2rkPXIjUoHQbzsSIaD83j886dlZOJoCfSiCB7p3x+zqupd dQqQ== X-Gm-Message-State: ALoCoQlC8ZCEo51fRav+A1UpHDy1u4VyGfJK7WaHjoCUkRVZSgjfjFNGkylPH6zYseuAy5kjrYfh X-Received: by 10.180.182.67 with SMTP id ec3mr14342315wic.58.1423819382430; Fri, 13 Feb 2015 01:23:02 -0800 (PST) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id a5sm2100153wib.20.2015.02.13.01.23.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Feb 2015 01:23:01 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Fri, 13 Feb 2015 10:22:32 +0100 Message-Id: <1423819371-24222-2-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1423819371-24222-1-git-send-email-olivier.matz@6wind.com> References: <1423041925-26956-1-git-send-email-olivier.matz@6wind.com> <1423819371-24222-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v3 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) {