From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by dpdk.org (Postfix) with ESMTP id A071F590F for ; Wed, 26 Nov 2014 15:54:17 +0100 (CET) Received: by mail-wg0-f48.google.com with SMTP id y19so3941863wgg.35 for ; Wed, 26 Nov 2014 07:05:14 -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=6n+YnUlFyKN6fxi/CL+MUH9rxZw70PS48l+rPvkA8+c=; b=lPPPWutiA4fV56ALfRNyjBdozsKia+N6kiZeEDaBKYBRfbJLp8tqt4IUKC34x29A8A RaMpsB2TmAH2fmhLtMvd/W4MiFBMYTwF4R0EhdqgkH9cwNSn16P4KADQP4QTsjLbdeRn 3Mvjga1wUVSQIQ0x5p86mgPxJkwEN+5C+uLWIoIGFtHZRLFOb/l1xEXrn91hGyzsEKrx KaQPDWtxUEBV6+wjQCaFRJH0yHV4vQeuLBJBdF6eXxZYBsPmB9ReGHXapBQxzFqfMFsp DBTGaKjmy7Kyzacf4TvpnGDJuS8XEIEYVz60+/gprJ4664vtwEfVfV6qnOkjUxOZ4+7V frKw== X-Gm-Message-State: ALoCoQlFBEUwNny2VCTbuG7tEBgEL9QvgUxQ+xExi6cV/lztUpkv1+EJSrzD6gFG0jVbBbetTD3s X-Received: by 10.194.61.227 with SMTP id t3mr37528346wjr.96.1417014314601; Wed, 26 Nov 2014 07:05:14 -0800 (PST) Received: from glumotte.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id bm1sm6682819wjb.45.2014.11.26.07.05.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Nov 2014 07:05:14 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Wed, 26 Nov 2014 16:04:45 +0100 Message-Id: <1417014295-29064-4-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417014295-29064-1-git-send-email-olivier.matz@6wind.com> References: <1416524335-22753-1-git-send-email-olivier.matz@6wind.com> <1417014295-29064-1-git-send-email-olivier.matz@6wind.com> Cc: jigsaw@gmail.com Subject: [dpdk-dev] [PATCH v4 03/13] mbuf: reorder tx ol_flags 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: Wed, 26 Nov 2014 14:54:18 -0000 The tx mbuf flags are now ordered from the lowest value to the the highest. Add comments to explain where to add new flags. By the way, move the PKT_TX_VXLAN_CKSUM at the right place. Signed-off-by: Olivier Matz Acked-by: Thomas Monjalon --- lib/librte_mbuf/rte_mbuf.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 5899e5c..faa9924 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -95,14 +95,11 @@ extern "C" { #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12) /**< RX tunnel packet with IPv6 header. */ #define PKT_RX_FDIR_ID (1ULL << 13) /**< FD id reported if FDIR match. */ #define PKT_RX_FDIR_FLX (1ULL << 14) /**< Flexible bytes reported if FDIR match. */ +/* add new RX flags here */ -#define PKT_TX_VLAN_PKT (1ULL << 55) /**< TX packet is a 802.1q VLAN packet. */ -#define PKT_TX_IP_CKSUM (1ULL << 54) /**< IP cksum of TX pkt. computed by NIC. */ +/* add new TX flags here */ #define PKT_TX_VXLAN_CKSUM (1ULL << 50) /**< TX checksum of VXLAN computed by NIC */ -#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ - +#define PKT_TX_IEEE1588_TMST (1ULL << 51) /**< TX IEEE1588 packet to timestamp. */ /* * Bits 52+53 used for L4 packet type with checksum enabled. * 00: Reserved @@ -116,8 +113,12 @@ extern "C" { #define PKT_TX_UDP_CKSUM (3ULL << 52) /**< UDP cksum of TX pkt. computed by NIC. */ #define PKT_TX_L4_MASK (3ULL << 52) /**< Mask for L4 cksum offload request. */ -/* Bit 51 - IEEE1588*/ -#define PKT_TX_IEEE1588_TMST (1ULL << 51) /**< TX IEEE1588 packet to timestamp. */ +#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. */ +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ + +#define PKT_TX_VLAN_PKT (1ULL << 55) /**< TX packet is a 802.1q VLAN packet. */ /* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63) /**< Mbuf contains control data */ -- 2.1.0