From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 228935A93 for ; Fri, 30 Jan 2015 14:16:35 +0100 (CET) Received: by mail-wg0-f42.google.com with SMTP id x13so26919553wgg.1 for ; Fri, 30 Jan 2015 05:16:35 -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=Wu+w4zujFdap031fykgGF+qdo/Azw6m35jm9Bkw4cpjz8C15mxFPxkzfqI0kNYPEeb GsoiAOrqKKtWQBwliFXgK0XVLnk4f3eO40QWcVAEHQKpZsvprHL1u24thf07Rnqm2WOB L96JLwil32ZmaQQM2PFk+TMqQcZ8hqEd6A5L0gSwKiD+Tg9ySfot49C6VFPpfttrPK0U qsw1W2gNEb91sn09/hmDS76tpAFm66W3mmKpXfVVtLyiwqYnBNPY6R80hm3PLVZhIKES QKm0XiAzPY/cF4p6neBPwXO1zAswXhAHvE4tJT+iQJuDK9ToGIYIS31Zzj33cujdApNO /U0Q== X-Gm-Message-State: ALoCoQmppQHdsKUGPWnwu97GEntgKOF3b43UHIWiGQ8RpvpafRaDjTCWBx8hdkvXgSmTaq9zBlJ3 X-Received: by 10.180.95.4 with SMTP id dg4mr4601109wib.61.1422623794996; Fri, 30 Jan 2015 05:16:34 -0800 (PST) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id li7sm6911300wic.4.2015.01.30.05.16.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Jan 2015 05:16:34 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Fri, 30 Jan 2015 14:16:00 +0100 Message-Id: <1422623775-8050-6-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> References: <1421883395-27235-1-git-send-email-olivier.matz@6wind.com> <1422623775-8050-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH 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: , X-List-Received-Date: Fri, 30 Jan 2015 13:16:36 -0000 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. */ /** -- 2.1.4