[dpdk-stable] patch 'net/failsafe: use prefix for function' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

This patch is being removed from stable/17.11 as it was mistakenly merged.
Patches having 'fix' keyword in the title were merged even though those don't
have "Cc: stable at dpdk.org" tag in the commit message.

If you think this patch is still needed for stable/17.11, please let me know.
Then I'll take it back.


Thanks,
Yongseok


> On Nov 29, 2018, at 3:10 PM, Yongseok Koh <yskoh at mellanox.com> wrote:
> 
> Hi,
> 
> FYI, your patch has been queued to LTS release 17.11.5
> 
> Note it hasn't been pushed to https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdpdk.org%2Fbrowse%2Fdpdk-stable&data=02%7C01%7Cyskoh%40mellanox.com%7Cc67ee1031dab42ef000608d65650629c%7Ca652971c7d2e4d9ba6a4d149256f461b%7C0%7C0%7C636791300627516921&sdata=Bw1JWchNKSVXoEB8U3NWJXyOtnQYixGcqOsOY8ndXYg%3D&reserved=0 yet.
> It will be pushed if I get no objections before 12/01/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.
> 
> Yongseok
> 
> ---
> From 1e254728404576db680bf5e3e1ec99204aa0815f Mon Sep 17 00:00:00 2001
> From: Stephen Hemminger <stephen at networkplumber.org>
> 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 <stephen at networkplumber.org>
> Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
> ---
> 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 5b5ac42ba..06aeea7ab 100644
> --- a/drivers/net/failsafe/failsafe_ether.c
> +++ b/drivers/net/failsafe/failsafe_ether.c
> @@ -488,7 +488,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
> 	/* Switch as soon as possible tx_dev. */
> 	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
> 	 * the callback at the source of the current thread context.
> diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
> index 40eabb784..c71baea38 100644
> --- a/drivers/net/failsafe/failsafe_private.h
> +++ b/drivers/net/failsafe/failsafe_private.h
> @@ -164,7 +164,7 @@ 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,
> 		struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
> @@ -376,7 +376,7 @@ fs_switch_dev(struct rte_eth_dev *dev,
> 	} else {
> 		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 178294c2e..4744702cd 100644
> --- a/drivers/net/failsafe/failsafe_rxtx.c
> +++ b/drivers/net/failsafe/failsafe_rxtx.c
> @@ -57,7 +57,7 @@ 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;
> 	uint8_t i;
> -- 
> 2.11.0
> 
> ---
>  Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- -	2018-11-29 15:01:47.834705064 -0800
> +++ 0059-net-failsafe-use-prefix-for-function.patch	2018-11-29 15:01:45.141959000 -0800
> @@ -1,8 +1,10 @@
> -From 86123c2dfb94416b4fb17e07bf31d32172308623 Mon Sep 17 00:00:00 2001
> +From 1e254728404576db680bf5e3e1ec99204aa0815f Mon Sep 17 00:00:00 2001
> From: Stephen Hemminger <stephen at networkplumber.org>
> 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 5b5ac42ba..06aeea7ab 100644
> --- a/drivers/net/failsafe/failsafe_ether.c
> +++ b/drivers/net/failsafe/failsafe_ether.c
> -@@ -570,7 +570,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
> +@@ -488,7 +488,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
>  	/* Switch as soon as possible tx_dev. */
>  	fs_switch_dev(sdev->fs_dev, sdev);
>  	/* Use safe bursts in any case. */
> @@ -28,10 +30,10 @@
>  	 * Async removal, the sub-PMD will try to unregister
>  	 * the callback at the source of the current thread context.
> diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
> -index b9d4608ab..442e6199f 100644
> +index 40eabb784..c71baea38 100644
> --- a/drivers/net/failsafe/failsafe_private.h
> +++ b/drivers/net/failsafe/failsafe_private.h
> -@@ -193,7 +193,7 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev *dev);
> +@@ -164,7 +164,7 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev *dev);
> 
>  /* RX / TX */
> 
> @@ -40,7 +42,7 @@
> 
>  uint16_t failsafe_rx_burst(void *rxq,
>  		struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
> -@@ -473,7 +473,7 @@ fs_switch_dev(struct rte_eth_dev *dev,
> +@@ -376,7 +376,7 @@ fs_switch_dev(struct rte_eth_dev *dev,
>  	} else {
>  		return;
>  	}
> @@ -50,10 +52,10 @@
>  }
> 
> diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c
> -index 7bd0f963e..034f47b87 100644
> +index 178294c2e..4744702cd 100644
> --- a/drivers/net/failsafe/failsafe_rxtx.c
> +++ b/drivers/net/failsafe/failsafe_rxtx.c
> -@@ -29,7 +29,7 @@ fs_tx_unsafe(struct sub_device *sdev)
> +@@ -57,7 +57,7 @@ fs_tx_unsafe(struct sub_device *sdev)
>  }
> 
>  void