From patchwork Mon Jan 29 09:37:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olivier Matz X-Patchwork-Id: 34599 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3847B1B3E4; Mon, 29 Jan 2018 10:37:24 +0100 (CET) Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 264451B3DE for ; Mon, 29 Jan 2018 10:37:23 +0100 (CET) Received: from glumotte.dev.6wind.com. (unknown [10.16.0.195]) by proxy.6wind.com (Postfix) with ESMTP id A0F9112894C; Mon, 29 Jan 2018 10:35:18 +0100 (CET) From: Olivier Matz To: dev@dpdk.org Cc: =?utf-8?q?Morten_Br=C3=B8rup?= Date: Mon, 29 Jan 2018 10:37:07 +0100 Message-Id: <20180129093707.18361-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <98CBD80474FA8B44BF855DF32C47DC35B41D74@smartserver.smartshare.dk> References: <98CBD80474FA8B44BF855DF32C47DC35B41D74@smartserver.smartshare.dk> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] mbuf: rename Tx VLAN flags X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" For consistency with the Rx flags, the flags PKT_TX_VLAN_PKT and PKT_TX_QINQ_PKT are respectively renamed as PKT_TX_VLAN and PKT_TX_QINQ. The old defines are deprecated but will stay for some time for compatibility. Reported-by: Morten Brørup Signed-off-by: Olivier Matz --- doc/guides/rel_notes/deprecation.rst | 4 ++++ lib/librte_mbuf/rte_mbuf.h | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index e98ce6a0a..43a39d827 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -72,3 +72,7 @@ Deprecation Notices - ``CTRL_MBUF_FLAG`` The packet mbuf API should be used as a replacement. + +* mbuf: The mbuf flags ``PKT_TX_VLAN_PKT`` and ``PKT_TX_QINQ_PKT`` are + respectively renamed as ``PKT_TX_VLAN`` and ``PKT_TX_QINQ``. The old + names will be removed in v18.08. diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 7835a2be8..4519fb303 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -244,7 +244,9 @@ extern "C" { /** * Second VLAN insertion (QinQ) flag. */ -#define PKT_TX_QINQ_PKT (1ULL << 49) /**< TX packet with double VLAN inserted. */ +#define PKT_TX_QINQ (1ULL << 49) /**< TX packet with double VLAN inserted. */ +/* this old name is deprecated */ +#define PKT_TX_QINQ_PKT PKT_TX_QINQ /** * TCP segmentation offload. To enable this offload feature for a @@ -305,7 +307,12 @@ extern "C" { */ #define PKT_TX_IPV6 (1ULL << 56) -#define PKT_TX_VLAN_PKT (1ULL << 57) /**< TX packet is a 802.1q VLAN packet. */ +/** + * TX packet is a 802.1q VLAN packet. + */ +#define PKT_TX_VLAN (1ULL << 57) +/* this old name is deprecated */ +#define PKT_TX_VLAN_PKT PKT_TX_VLAN /** * Offload the IP checksum of an external header in the hardware. The