[dpdk-stable] patch 'ethdev: fix endian annotation for SPI item' has been queued to LTS release 17.11.10
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Dec 19 15:32:31 CET 2019
Hi,
FYI, your patch has been queued to LTS release 17.11.10
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/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.
Thanks.
Luca Boccassi
---
>From 940d6c60d5748d9b2c243e55148fc0fa812c6ce7 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 20 Aug 2019 15:45:03 +0200
Subject: [PATCH] ethdev: fix endian annotation for SPI item
[ upstream commit fbb25a3878cc7c6de4c68c8cee01983d127e2205 ]
Security Parameters Index (SPI) should be set with network endian
values.
While 0xffffffff == htonl(0xffffffff), this missing annotation is
caught by sparse when compiling ovs (dpdk-latest branch).
Fixes: d4b684f7197a ("net: add ESP header to generic flow steering")
Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
lib/librte_ether/rte_flow.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
index 47c88ea520..8cbf38df3a 100644
--- a/lib/librte_ether/rte_flow.h
+++ b/lib/librte_ether/rte_flow.h
@@ -807,7 +807,7 @@ struct rte_flow_item_esp {
#ifndef __cplusplus
static const struct rte_flow_item_esp rte_flow_item_esp_mask = {
.hdr = {
- .spi = 0xffffffff,
+ .spi = RTE_BE32(0xffffffff),
},
};
#endif
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-12-19 14:32:26.509052690 +0000
+++ 0004-ethdev-fix-endian-annotation-for-SPI-item.patch 2019-12-19 14:32:25.393283707 +0000
@@ -1,27 +1,28 @@
-From fbb25a3878cc7c6de4c68c8cee01983d127e2205 Mon Sep 17 00:00:00 2001
+From 940d6c60d5748d9b2c243e55148fc0fa812c6ce7 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 20 Aug 2019 15:45:03 +0200
Subject: [PATCH] ethdev: fix endian annotation for SPI item
+[ upstream commit fbb25a3878cc7c6de4c68c8cee01983d127e2205 ]
+
Security Parameters Index (SPI) should be set with network endian
values.
While 0xffffffff == htonl(0xffffffff), this missing annotation is
caught by sparse when compiling ovs (dpdk-latest branch).
Fixes: d4b684f7197a ("net: add ESP header to generic flow steering")
-Cc: stable at dpdk.org
Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
- lib/librte_ethdev/rte_flow.h | 2 +-
+ lib/librte_ether/rte_flow.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
-index b66bf1495b..354cb1dd0f 100644
---- a/lib/librte_ethdev/rte_flow.h
-+++ b/lib/librte_ethdev/rte_flow.h
-@@ -935,7 +935,7 @@ struct rte_flow_item_esp {
+diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
+index 47c88ea520..8cbf38df3a 100644
+--- a/lib/librte_ether/rte_flow.h
++++ b/lib/librte_ether/rte_flow.h
+@@ -807,7 +807,7 @@ struct rte_flow_item_esp {
#ifndef __cplusplus
static const struct rte_flow_item_esp rte_flow_item_esp_mask = {
.hdr = {
More information about the stable
mailing list