[dpdk-stable] patch 'net/bonding: use non deprecated PCI API' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Tue Dec 10 15:59:12 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/16/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/2f90f0a745b21fb8cb61645cd4096aa0f923a091

Thanks.

Kevin.

---
>From 2f90f0a745b21fb8cb61645cd4096aa0f923a091 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 25 Oct 2019 15:56:04 +0200
Subject: [PATCH] net/bonding: use non deprecated PCI API

[ upstream commit ce77e6bf5113650e6d026e0b7fb395b60ab1f363 ]

rte_eal_compare_pci_addr has been deprecated since v17.11.
Convert to rte_pci_addr_cmp.

Fixes: c848b518bbc7 ("net/bonding: support bifurcated driver in eal")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
---
 drivers/net/bonding/rte_eth_bond_args.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
index b60fde6a8..977c472d4 100644
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -64,9 +64,8 @@ static inline int
 bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
 {
-	struct rte_pci_device *pdev;
+	const struct rte_pci_device *pdev = RTE_DEV_TO_PCI_CONST(dev);
 	const struct rte_pci_addr *paddr = _pci_addr;
 
-	pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev);
-	return rte_eal_compare_pci_addr(&pdev->addr, paddr);
+	return rte_pci_addr_cmp(&pdev->addr, paddr);
 }
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:41.661581275 +0000
+++ 0038-net-bonding-use-non-deprecated-PCI-API.patch	2019-12-10 14:49:39.067457488 +0000
@@ -1 +1 @@
-From ce77e6bf5113650e6d026e0b7fb395b60ab1f363 Mon Sep 17 00:00:00 2001
+From 2f90f0a745b21fb8cb61645cd4096aa0f923a091 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ce77e6bf5113650e6d026e0b7fb395b60ab1f363 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index f298ea0e1..bfe03c3d0 100644
+index b60fde6a8..977c472d4 100644
@@ -22 +23 @@
-@@ -61,9 +61,8 @@ static inline int
+@@ -64,9 +64,8 @@ static inline int



More information about the stable mailing list