From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9901B1B113 for ; Wed, 21 Nov 2018 17:50:50 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 003F1307D84C; Wed, 21 Nov 2018 16:50:50 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCA315C21E; Wed, 21 Nov 2018 16:50:48 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Gaetan Rivet , dpdk stable Date: Wed, 21 Nov 2018 16:48:08 +0000 Message-Id: <20181121164828.32249-54-ktraynor@redhat.com> In-Reply-To: <20181121164828.32249-1-ktraynor@redhat.com> References: <20181121164828.32249-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 21 Nov 2018 16:50:50 +0000 (UTC) Subject: [dpdk-stable] patch 'net/failsafe: use prefix for function' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Wed, 21 Nov 2018 16:50:51 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From c6b7a0f2f12169bdc205c612aa6473822a69f6c3 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 8 Oct 2018 15:31:40 -0700 Subject: [PATCH] net/failsafe: use prefix for function [ upstream commit 86123c2dfb94416b4fb17e07bf31d32172308623 ] All other visible functions in failsafe driver have 'failsafe_' prefix. Signed-off-by: Stephen Hemminger Acked-by: Gaetan Rivet --- drivers/net/failsafe/failsafe_ether.c | 2 +- drivers/net/failsafe/failsafe_private.h | 4 ++-- drivers/net/failsafe/failsafe_rxtx.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c index 5b5cb3b49..5f6fbf876 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c @@ -467,5 +467,5 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused, fs_switch_dev(sdev->fs_dev, sdev); /* Use safe bursts in any case. */ - set_burst_fn(sdev->fs_dev, 1); + failsafe_set_burst_fn(sdev->fs_dev, 1); /* * Async removal, the sub-PMD will try to unregister diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index 886af8616..b740b36ec 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -189,5 +189,5 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev *dev); /* RX / TX */ -void set_burst_fn(struct rte_eth_dev *dev, int force_safe); +void failsafe_set_burst_fn(struct rte_eth_dev *dev, int force_safe); uint16_t failsafe_rx_burst(void *rxq, @@ -469,5 +469,5 @@ fs_switch_dev(struct rte_eth_dev *dev, return; } - set_burst_fn(dev, 0); + failsafe_set_burst_fn(dev, 0); rte_wmb(); } diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c index 7bd0f963e..034f47b87 100644 --- a/drivers/net/failsafe/failsafe_rxtx.c +++ b/drivers/net/failsafe/failsafe_rxtx.c @@ -30,5 +30,5 @@ fs_tx_unsafe(struct sub_device *sdev) void -set_burst_fn(struct rte_eth_dev *dev, int force_safe) +failsafe_set_burst_fn(struct rte_eth_dev *dev, int force_safe) { struct sub_device *sdev; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 16:44:32.424201292 +0000 +++ 0054-net-failsafe-use-prefix-for-function.patch 2018-11-21 16:44:30.000000000 +0000 @@ -1,8 +1,10 @@ -From 86123c2dfb94416b4fb17e07bf31d32172308623 Mon Sep 17 00:00:00 2001 +From c6b7a0f2f12169bdc205c612aa6473822a69f6c3 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 8 Oct 2018 15:31:40 -0700 Subject: [PATCH] net/failsafe: use prefix for function +[ upstream commit 86123c2dfb94416b4fb17e07bf31d32172308623 ] + All other visible functions in failsafe driver have 'failsafe_' prefix. @@ -15,10 +17,10 @@ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c -index 884b86882..178316521 100644 +index 5b5cb3b49..5f6fbf876 100644 --- a/drivers/net/failsafe/failsafe_ether.c +++ b/drivers/net/failsafe/failsafe_ether.c -@@ -571,5 +571,5 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused, +@@ -467,5 +467,5 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused, fs_switch_dev(sdev->fs_dev, sdev); /* Use safe bursts in any case. */ - set_burst_fn(sdev->fs_dev, 1); @@ -26,17 +28,17 @@ /* * Async removal, the sub-PMD will try to unregister diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h -index b9d4608ab..442e6199f 100644 +index 886af8616..b740b36ec 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h -@@ -194,5 +194,5 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev *dev); +@@ -189,5 +189,5 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev *dev); /* RX / TX */ -void set_burst_fn(struct rte_eth_dev *dev, int force_safe); +void failsafe_set_burst_fn(struct rte_eth_dev *dev, int force_safe); uint16_t failsafe_rx_burst(void *rxq, -@@ -474,5 +474,5 @@ fs_switch_dev(struct rte_eth_dev *dev, +@@ -469,5 +469,5 @@ fs_switch_dev(struct rte_eth_dev *dev, return; } - set_burst_fn(dev, 0);