From patchwork Wed Oct 23 13:40:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 61771 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 EDE5F1C1DA; Wed, 23 Oct 2019 15:40:28 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 1CB351C1AD for ; Wed, 23 Oct 2019 15:40:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571838018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vE7CyjMLivQFphUU6CP6OjEaqVRmj9YydCyHuLzr/UA=; b=Kr5NS81mMWRzccLixW0kMu+KgOrhXjAgpSIHSGyJUMIYB/V+JPWvzwxHnXMF06s6vnxx7v BjCl9FazmbB5bRHnN9iYqeqSWY6p1d+d0kN8mjBPxdXRYw/9Hog3UdOoaD0s0HqvoeJH95 +SAuhXNrGbe9wvjEBfmopeyKQWSXfy0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-1-mhiak2bjPVeQdnKXLkZ8IQ-1; Wed, 23 Oct 2019 09:40:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1440380183E; Wed, 23 Oct 2019 13:40:13 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com [10.40.204.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3B7E60BE1; Wed, 23 Oct 2019 13:40:11 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: olivier.matz@6wind.com, ferruh.yigit@intel.com, stable@dpdk.org Date: Wed, 23 Oct 2019 15:40:00 +0200 Message-Id: <1571838001-591-4-git-send-email-david.marchand@redhat.com> In-Reply-To: <1571838001-591-1-git-send-email-david.marchand@redhat.com> References: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> <1571838001-591-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: mhiak2bjPVeQdnKXLkZ8IQ-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [PATCH v2 3/4] net: add rte prefix to MPLS structure 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" Add 'rte_' prefix to structures: - rename struct mpls_hdr as struct rte_mpls_hdr. Cc: stable@dpdk.org Signed-off-by: David Marchand --- Changelog since v1: - added missing update on release notes, --- doc/guides/rel_notes/release_19_11.rst | 2 ++ lib/librte_net/rte_mpls.h | 2 +- lib/librte_net/rte_net.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst index e97d2cc..e7752e5 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -166,6 +166,8 @@ API Changes * The network definitions of PPPoE ethertypes have been prefixed by ``RTE_``. +* The network structure for MPLS has been prefixed by ``rte_``. + * ethdev: changed ``rte_eth_dev_infos_get`` return value from ``void`` to ``int`` to provide a way to report various error conditions. diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h index 11d26ba..32b6431 100644 --- a/lib/librte_net/rte_mpls.h +++ b/lib/librte_net/rte_mpls.h @@ -21,7 +21,7 @@ extern "C" { /** * MPLS header. */ -struct mpls_hdr { +struct rte_mpls_hdr { uint16_t tag_msb; /**< Label(msb). */ #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN uint8_t tag_lsb:4; /**< Label(lsb). */ diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index dfccbbf..6f45b13 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -278,8 +278,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, } else if ((proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS)) || (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLSM))) { unsigned int i; - const struct mpls_hdr *mh; - struct mpls_hdr mh_copy; + const struct rte_mpls_hdr *mh; + struct rte_mpls_hdr mh_copy; #define MAX_MPLS_HDR 5 for (i = 0; i < MAX_MPLS_HDR; i++) {