[dpdk-stable] patch 'test/bonding: fix LSC timeout unit' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 3 19:27:06 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

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/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/92322df07531db01847eb6fad9510d99e46bdcba

Thanks.

Kevin.

---
>From 92322df07531db01847eb6fad9510d99e46bdcba Mon Sep 17 00:00:00 2001
From: Krzysztof Kanas <kkanas at marvell.com>
Date: Fri, 23 Aug 2019 10:16:59 +0200
Subject: [PATCH] test/bonding: fix LSC timeout unit

[ upstream commit 7de47c3c2377115ba5d37d3432c0b348a40572a9 ]

Fixes: 76d29903f5f5 ("bond: support link status interrupt")

Signed-off-by: Krzysztof Kanas <kkanas at marvell.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 test/test/test_link_bonding.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c
index 11cc2c9b2..7a44de168 100644
--- a/test/test/test_link_bonding.c
+++ b/test/test/test_link_bonding.c
@@ -1126,5 +1126,5 @@ test_adding_slave_after_bonded_device_started(void)
 
 #define TEST_STATUS_INTERRUPT_SLAVE_COUNT	4
-#define TEST_LSC_WAIT_TIMEOUT_MS	500
+#define TEST_LSC_WAIT_TIMEOUT_US	500000
 
 int test_lsc_interrupt_count;
@@ -1219,5 +1219,5 @@ test_status_interrupt(void)
 			test_params->slave_port_ids[3], 0);
 
-	TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_MS) == 0,
+	TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_US) == 0,
 			"timed out waiting for interrupt");
 
@@ -1238,5 +1238,5 @@ test_status_interrupt(void)
 			test_params->slave_port_ids[0], 1);
 
-	TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_MS) == 0,
+	TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_US) == 0,
 			"timed out waiting for interrupt");
 
@@ -1252,5 +1252,5 @@ test_status_interrupt(void)
 			test_params->slave_port_ids[0], 1);
 
-	TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_MS) != 0,
+	TEST_ASSERT(lsc_timeout(TEST_LSC_WAIT_TIMEOUT_US) != 0,
 			"received unexpected interrupt");
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:55.037198356 +0000
+++ 0057-test-bonding-fix-LSC-timeout-unit.patch	2019-12-03 17:29:51.784749245 +0000
@@ -1 +1 @@
-From 7de47c3c2377115ba5d37d3432c0b348a40572a9 Mon Sep 17 00:00:00 2001
+From 92322df07531db01847eb6fad9510d99e46bdcba Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7de47c3c2377115ba5d37d3432c0b348a40572a9 ]
+
@@ -7 +8,0 @@
-Cc: stable at dpdk.org
@@ -12 +13 @@
- app/test/test_link_bonding.c | 8 ++++----
+ test/test/test_link_bonding.c | 8 ++++----
@@ -15,5 +16,5 @@
-diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
-index b5ce9dbb4..3a46f943f 100644
---- a/app/test/test_link_bonding.c
-+++ b/app/test/test_link_bonding.c
-@@ -1169,5 +1169,5 @@ test_adding_slave_after_bonded_device_started(void)
+diff --git a/test/test/test_link_bonding.c b/test/test/test_link_bonding.c
+index 11cc2c9b2..7a44de168 100644
+--- a/test/test/test_link_bonding.c
++++ b/test/test/test_link_bonding.c
+@@ -1126,5 +1126,5 @@ test_adding_slave_after_bonded_device_started(void)
@@ -26 +27 @@
-@@ -1262,5 +1262,5 @@ test_status_interrupt(void)
+@@ -1219,5 +1219,5 @@ test_status_interrupt(void)
@@ -33 +34 @@
-@@ -1281,5 +1281,5 @@ test_status_interrupt(void)
+@@ -1238,5 +1238,5 @@ test_status_interrupt(void)
@@ -40 +41 @@
-@@ -1295,5 +1295,5 @@ test_status_interrupt(void)
+@@ -1252,5 +1252,5 @@ test_status_interrupt(void)



More information about the stable mailing list