From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 1EE00A0096 for ; Wed, 8 May 2019 18:03:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17ED5DE3; Wed, 8 May 2019 18:03:30 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C18664F90 for ; Wed, 8 May 2019 18:03:28 +0200 (CEST) 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 mx1.redhat.com (Postfix) with ESMTPS id 30455307D9CE; Wed, 8 May 2019 16:03:28 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDFFB60C82; Wed, 8 May 2019 16:03:26 +0000 (UTC) From: Kevin Traynor To: Erik Gabriel Carrillo Cc: Jerin Jacob , John McNamara , dpdk stable Date: Wed, 8 May 2019 17:02:31 +0100 Message-Id: <20190508160233.2648-34-ktraynor@redhat.com> In-Reply-To: <20190508160233.2648-1-ktraynor@redhat.com> References: <20190508160233.2648-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 08 May 2019 16:03:28 +0000 (UTC) Subject: [dpdk-stable] patch 'eventdev: update references to removed function' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/14/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/ca4728bd0333fffd8b54f56093f2e81bce234540 Thanks. Kevin Traynor --- >From ca4728bd0333fffd8b54f56093f2e81bce234540 Mon Sep 17 00:00:00 2001 From: Erik Gabriel Carrillo Date: Mon, 29 Apr 2019 09:38:06 -0500 Subject: [PATCH] eventdev: update references to removed function [ upstream commit 92b5ea41bb69c15220707a9f3954b6dc0058e956 ] Remove references to the (deleted) rte_event_port_enqueue_depth() function in the Doxygen comments for rte_event_enqueue_burst() and friends, and replace with references to rte_event_port_attr_get(). Fixes: 78ffab961155 ("eventdev: add port attribute function") Fixes: c9bf83947e2e ("eventdev: add eth Tx adapter APIs") Signed-off-by: Erik Gabriel Carrillo Acked-by: Jerin Jacob Acked-by: John McNamara --- lib/librte_eventdev/rte_event_eth_tx_adapter.h | 3 ++- lib/librte_eventdev/rte_eventdev.h | 17 +++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/librte_eventdev/rte_event_eth_tx_adapter.h index 81456d4a9..7a4a01fa7 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.h +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.h @@ -366,5 +366,6 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id); * @param nb_events * The number of event objects to enqueue, typically number of - * rte_event_port_enqueue_depth() available for this port. + * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...) + * available for this port. * * @return diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h index b90a18d8b..38608114d 100644 --- a/lib/librte_eventdev/rte_eventdev.h +++ b/lib/librte_eventdev/rte_eventdev.h @@ -1367,5 +1367,6 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, * @param nb_events * The number of event objects to enqueue, typically number of - * rte_event_port_enqueue_depth() available for this port. + * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...) + * available for this port. * * @return @@ -1382,5 +1383,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, * one or more events. This error code is only applicable to * closed systems. - * @see rte_event_port_enqueue_depth() + * @see rte_event_port_attr_get(), RTE_EVENT_PORT_ATTR_ENQ_DEPTH */ static inline uint16_t @@ -1416,5 +1417,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, * @param nb_events * The number of event objects to enqueue, typically number of - * rte_event_port_enqueue_depth() available for this port. + * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...) + * available for this port. * * @return @@ -1431,5 +1433,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, * one or more events. This error code is only applicable to * closed systems. - * @see rte_event_port_enqueue_depth() rte_event_enqueue_burst() + * @see rte_event_port_attr_get(), RTE_EVENT_PORT_ATTR_ENQ_DEPTH + * @see rte_event_enqueue_burst() */ static inline uint16_t @@ -1465,5 +1468,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id, * @param nb_events * The number of event objects to enqueue, typically number of - * rte_event_port_enqueue_depth() available for this port. + * rte_event_port_attr_get(...RTE_EVENT_PORT_ATTR_ENQ_DEPTH...) + * available for this port. * * @return @@ -1480,5 +1484,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id, * one or more events. This error code is only applicable to * closed systems. - * @see rte_event_port_enqueue_depth() rte_event_enqueue_burst() + * @see rte_event_port_attr_get(), RTE_EVENT_PORT_ATTR_ENQ_DEPTH + * @see rte_event_enqueue_burst() */ static inline uint16_t -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 16:33:59.172048523 +0100 +++ 0034-eventdev-update-references-to-removed-function.patch 2019-05-08 16:33:57.450576951 +0100 @@ -1 +1 @@ -From 92b5ea41bb69c15220707a9f3954b6dc0058e956 Mon Sep 17 00:00:00 2001 +From ca4728bd0333fffd8b54f56093f2e81bce234540 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 92b5ea41bb69c15220707a9f3954b6dc0058e956 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 1b5278fdb..9bed12b3a 100644 +index 81456d4a9..7a4a01fa7 100644 @@ -26 +27 @@ -@@ -323,5 +323,6 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id); +@@ -366,5 +366,6 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id); @@ -35 +36 @@ -index 43b1a248a..517cd8083 100644 +index b90a18d8b..38608114d 100644 @@ -38 +39 @@ -@@ -1364,5 +1364,6 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, +@@ -1367,5 +1367,6 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, @@ -46 +47 @@ -@@ -1379,5 +1380,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, +@@ -1382,5 +1383,5 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, @@ -53 +54 @@ -@@ -1413,5 +1414,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, +@@ -1416,5 +1417,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, @@ -61 +62 @@ -@@ -1428,5 +1430,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, +@@ -1431,5 +1433,6 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, @@ -69 +70 @@ -@@ -1462,5 +1465,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id, +@@ -1465,5 +1468,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id, @@ -77 +78 @@ -@@ -1477,5 +1481,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id, +@@ -1480,5 +1484,6 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,