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

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Dec 19 15:33:59 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 924cd8b3b32a12caa9c3515919de258c3b6dad6e 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 8c94cc6171..e543f53ed6 100644
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -92,11 +92,10 @@ find_port_id_by_dev_name(const char *name)
 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.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:30.003580830 +0000
+++ 0092-net-bonding-use-non-deprecated-PCI-API.patch	2019-12-19 14:32:26.217300046 +0000
@@ -1,13 +1,14 @@
-From ce77e6bf5113650e6d026e0b7fb395b60ab1f363 Mon Sep 17 00:00:00 2001
+From 924cd8b3b32a12caa9c3515919de258c3b6dad6e 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")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Acked-by: Thomas Monjalon <thomas at monjalon.net>
@@ -16,10 +17,10 @@
  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 f298ea0e17..bfe03c3d06 100644
+index 8c94cc6171..e543f53ed6 100644
 --- a/drivers/net/bonding/rte_eth_bond_args.c
 +++ b/drivers/net/bonding/rte_eth_bond_args.c
-@@ -60,11 +60,10 @@ find_port_id_by_dev_name(const char *name)
+@@ -92,11 +92,10 @@ find_port_id_by_dev_name(const char *name)
  static inline int
  bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
  {


More information about the stable mailing list