[dpdk-stable] patch 'net: fix pedantic build' has been queued to stable release 19.11.4

luca.boccassi at gmail.com luca.boccassi at gmail.com
Fri Jul 24 14:00:14 CEST 2020


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 ba90ba0ca2285ab0a2af461eb2c3c3e10d0c5795 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland at mellanox.com>
Date: Tue, 21 Jul 2020 11:31:55 +0300
Subject: [PATCH] net: fix pedantic build

[ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ]

when trying to compile rte_mpls with pedantic enabled,
on old compilers like 4.8 it will complain about bit field definition.

error: type of bit-field 'bs' is a GCC extension [-Werror=pedantic]
error: type of bit-field 'tc' is a GCC extension [-Werror=pedantic]
error: type of bit-field 'tag_lsb' is a GCC extension [-Werror=pedantic]

This fixes the compilation error by adding extension to the header
definition.

Fixes: e480cf487a0d ("net: add MPLS header structure")

Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_net/rte_mpls.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h
index 32b643121..14663f51b 100644
--- a/lib/librte_net/rte_mpls.h
+++ b/lib/librte_net/rte_mpls.h
@@ -21,6 +21,7 @@ extern "C" {
 /**
  * MPLS header.
  */
+__extension__
 struct rte_mpls_hdr {
 	uint16_t tag_msb;   /**< Label(msb). */
 #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:55.352782735 +0100
+++ 0176-net-fix-pedantic-build.patch	2020-07-24 12:53:48.599012273 +0100
@@ -1,8 +1,10 @@
-From e4f9eab7d948b952cc65e9e360576de3ff1f7a9e Mon Sep 17 00:00:00 2001
+From ba90ba0ca2285ab0a2af461eb2c3c3e10d0c5795 Mon Sep 17 00:00:00 2001
 From: Raslan Darawsheh <rasland at mellanox.com>
 Date: Tue, 21 Jul 2020 11:31:55 +0300
 Subject: [PATCH] net: fix pedantic build
 
+[ upstream commit e4f9eab7d948b952cc65e9e360576de3ff1f7a9e ]
+
 when trying to compile rte_mpls with pedantic enabled,
 on old compilers like 4.8 it will complain about bit field definition.
 
@@ -14,7 +16,6 @@
 definition.
 
 Fixes: e480cf487a0d ("net: add MPLS header structure")
-Cc: stable at dpdk.org
 
 Signed-off-by: Raslan Darawsheh <rasland at mellanox.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -23,7 +24,7 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h
-index db91707e6..3e8cb90ec 100644
+index 32b643121..14663f51b 100644
 --- a/lib/librte_net/rte_mpls.h
 +++ b/lib/librte_net/rte_mpls.h
 @@ -21,6 +21,7 @@ extern "C" {


More information about the stable mailing list