From patchwork Wed Feb 4 09:25:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 2949 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 0F803ADE1; Wed, 4 Feb 2015 10:25:49 +0100 (CET) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by dpdk.org (Postfix) with ESMTP id 9966DADC7 for ; Wed, 4 Feb 2015 10:25:45 +0100 (CET) Received: by mail-we0-f178.google.com with SMTP id k48so526730wev.9 for ; Wed, 04 Feb 2015 01:25:45 -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=CFZlZXq5AoO1sEqgn4O18voca4ZwNp49LiBYrIi/4dY=; b=ObGuXNE1D7P0BlS5zR/I6kn5+ALr0C+CBFD03ItwedBmJVcaJpStIymkwS5tnJXME9 bTpi8/re3sr+0uR4oAM+vjrwPcj3kpriv74yZHXvHcLQA/J7tYwwvqRhqo4HtXjComQd /0uwR5RRQa1hNvoASdjcPWsg6oJzQypgtM0s7503uQJq1U4QZZRX1Q7QNxIWTfKZHSNf K1kSojcsBZFhtea8j4gLqUpaeVAw/nLZr98kIv8CDiMYc42f/DrYrIkPMS5oDN6XMySA c4Xe7coAJ8yj2QIIXu90+y7gaICUVWzfreMEiMLcayKKJ+1rjvyiu1gG76P5RrC8diFT SBLA== X-Gm-Message-State: ALoCoQmzFdf1rpTTTV72oAR53WBI6RJHcLr+teG6WpEddC/fZbLRVjg6oOhWMACgaidjIECfOMRp X-Received: by 10.194.60.104 with SMTP id g8mr6008185wjr.96.1423041945511; Wed, 04 Feb 2015 01:25:45 -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.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 01:25:44 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Wed, 4 Feb 2015 10:25:10 +0100 Message-Id: <1423041925-26956-6-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 05/20] mbuf: remove PKT_TX_UDP_TUNNEL_PKT flag 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" Since previous commit, this flag is not used by any PMD, remove it from mbuf API and from csumonly (testpmd). In csumonly, the PKT_TX_OUTER_IP_CKSUM flag is already set for vxlan checksum, providing enough information to the underlying driver. Signed-off-by: Olivier Matz --- app/test-pmd/csumonly.c | 4 ---- lib/librte_mbuf/rte_mbuf.c | 1 - lib/librte_mbuf/rte_mbuf.h | 5 +---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 4b438d1..ca5ca39 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -255,9 +255,6 @@ process_outer_cksums(void *outer_l3_hdr, uint16_t outer_ethertype, struct udp_hdr *udp_hdr; uint64_t ol_flags = 0; - if (testpmd_ol_flags & TESTPMD_TX_OFFLOAD_VXLAN_CKSUM) - ol_flags |= PKT_TX_UDP_TUNNEL_PKT; - if (outer_ethertype == _htons(ETHER_TYPE_IPv4)) { ipv4_hdr->hdr_checksum = 0; ol_flags |= PKT_TX_OUTER_IPV4; @@ -473,7 +470,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) { PKT_TX_UDP_CKSUM, PKT_TX_L4_MASK }, { PKT_TX_TCP_CKSUM, PKT_TX_L4_MASK }, { PKT_TX_SCTP_CKSUM, PKT_TX_L4_MASK }, - { PKT_TX_UDP_TUNNEL_PKT, PKT_TX_UDP_TUNNEL_PKT }, { PKT_TX_IPV4, PKT_TX_IPV4 }, { PKT_TX_IPV6, PKT_TX_IPV6 }, { PKT_TX_OUTER_IP_CKSUM, PKT_TX_OUTER_IP_CKSUM }, diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 1b14e02..2a4bc8c 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -240,7 +240,6 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask) case PKT_TX_SCTP_CKSUM: return "PKT_TX_SCTP_CKSUM"; case PKT_TX_UDP_CKSUM: return "PKT_TX_UDP_CKSUM"; case PKT_TX_IEEE1588_TMST: return "PKT_TX_IEEE1588_TMST"; - case PKT_TX_UDP_TUNNEL_PKT: return "PKT_TX_UDP_TUNNEL_PKT"; case PKT_TX_TCP_SEG: return "PKT_TX_TCP_SEG"; case PKT_TX_IPV4: return "PKT_TX_IPV4"; case PKT_TX_IPV6: return "PKT_TX_IPV6"; diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 191a42c..d841caa 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -117,11 +117,8 @@ extern "C" { * and set it in the TCP header. Refer to rte_ipv4_phdr_cksum() and * rte_ipv6_phdr_cksum() that can be used as helpers. */ -#define PKT_TX_TCP_SEG (1ULL << 49) +#define PKT_TX_TCP_SEG (1ULL << 50) -/** TX packet is an UDP tunneled packet. It must be specified when using - * outer checksum offload (PKT_TX_OUTER_IP_CKSUM) */ -#define PKT_TX_UDP_TUNNEL_PKT (1ULL << 50) /**< TX packet is an UDP tunneled packet */ #define PKT_TX_IEEE1588_TMST (1ULL << 51) /**< TX IEEE1588 packet to timestamp. */ /**