[dpdk-stable] patch 'meter: remove inline functions from export list' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From 451a93ce727a0adf151f8b4e808b4f16c55933bb Mon Sep 17 00:00:00 2001
From: Fady Bader <fady at mellanox.com>
Date: Wed, 17 Jun 2020 11:24:31 +0300
Subject: [PATCH] meter: remove inline functions from export list

[ upstream commit f6da77d92ddc76bb5bd0ea9bf4ff044c9fde1a9b ]

The code didn't compile when using exported meter functions under Windows.

error LNK2001: unresolved external symbol
rte_meter_srtcm_color_aware_check
error LNK2001: unresolved external symbol
rte_meter_srtcm_color_blind_check
error LNK2001: unresolved external symbol
rte_meter_trtcm_color_aware_check
error LNK2001: unresolved external symbol
rte_meter_trtcm_color_blind_check
error LNK2001: unresolved external symbol
rte_meter_trtcm_rfc4115_color_aware_check
error LNK2001: unresolved external symbol
rte_meter_trtcm_rfc4115_color_blind_check

The cause was that there were some inline functions that were included in
the export list.
To solve this the functions were removed from rte_meter_version.map export
list which are implemented in the header and shouldn't be exported.

Fixes: 655796d2b5fb ("meter: support RFC4115 trTCM")
Fixes: 9d41beed24b0 ("lib: provide initial versioning")

Signed-off-by: Fady Bader <fady at mellanox.com>
---
 lib/librte_meter/rte_meter_version.map | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
index 46410b036..3fc7ddd19 100644
--- a/lib/librte_meter/rte_meter_version.map
+++ b/lib/librte_meter/rte_meter_version.map
@@ -1,12 +1,8 @@
 DPDK_20.0 {
 	global:
 
-	rte_meter_srtcm_color_aware_check;
-	rte_meter_srtcm_color_blind_check;
 	rte_meter_srtcm_config;
 	rte_meter_srtcm_profile_config;
-	rte_meter_trtcm_color_aware_check;
-	rte_meter_trtcm_color_blind_check;
 	rte_meter_trtcm_config;
 	rte_meter_trtcm_profile_config;
 
@@ -16,8 +12,6 @@ DPDK_20.0 {
 EXPERIMENTAL {
 	global:
 
-	rte_meter_trtcm_rfc4115_color_aware_check;
-	rte_meter_trtcm_rfc4115_color_blind_check;
 	rte_meter_trtcm_rfc4115_config;
 	rte_meter_trtcm_rfc4115_profile_config;
 };
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.199270985 +0100
+++ 0041-meter-remove-inline-functions-from-export-list.patch	2020-07-24 12:53:48.255005863 +0100
@@ -1,8 +1,10 @@
-From f6da77d92ddc76bb5bd0ea9bf4ff044c9fde1a9b Mon Sep 17 00:00:00 2001
+From 451a93ce727a0adf151f8b4e808b4f16c55933bb Mon Sep 17 00:00:00 2001
 From: Fady Bader <fady at mellanox.com>
 Date: Wed, 17 Jun 2020 11:24:31 +0300
 Subject: [PATCH] meter: remove inline functions from export list
 
+[ upstream commit f6da77d92ddc76bb5bd0ea9bf4ff044c9fde1a9b ]
+
 The code didn't compile when using exported meter functions under Windows.
 
 error LNK2001: unresolved external symbol
@@ -25,7 +27,6 @@
 
 Fixes: 655796d2b5fb ("meter: support RFC4115 trTCM")
 Fixes: 9d41beed24b0 ("lib: provide initial versioning")
-Cc: stable at dpdk.org
 
 Signed-off-by: Fady Bader <fady at mellanox.com>
 ---
@@ -33,7 +34,7 @@
  1 file changed, 6 deletions(-)
 
 diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
-index b493bcebe..58859d4d7 100644
+index 46410b036..3fc7ddd19 100644
 --- a/lib/librte_meter/rte_meter_version.map
 +++ b/lib/librte_meter/rte_meter_version.map
 @@ -1,12 +1,8 @@
@@ -50,14 +51,14 @@
  	rte_meter_trtcm_profile_config;
  
 @@ -16,8 +12,6 @@ DPDK_20.0 {
- DPDK_21 {
+ EXPERIMENTAL {
  	global:
  
 -	rte_meter_trtcm_rfc4115_color_aware_check;
 -	rte_meter_trtcm_rfc4115_color_blind_check;
  	rte_meter_trtcm_rfc4115_config;
  	rte_meter_trtcm_rfc4115_profile_config;
- 
+ };
 -- 
 2.20.1