diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:47:51 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:48:05 +0100 |
| commit | 41921c54b898292b0140d5f322cc8ec5b0642a7e (patch) | |
| tree | 70c62f3b26536abf0fa4b347300c78360d4ff546 /drivers/net/sfc/sfc.c | |
| parent | 76f89ef557ff345dfa606e797e1765404babce56 (diff) | |
| parent | f239aed5e674965691846e8ce3f187dd47523689 (diff) | |
Merge branch 'upstream' into HEAD
Change-Id: Ib9772cbbc33c14a44bd918056b22602ff6891a18
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/sfc/sfc.c')
| -rw-r--r-- | drivers/net/sfc/sfc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 4e241b22..6cecfc00 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -465,7 +465,7 @@ static int sfc_mem_bar_init(struct sfc_adapter *sa) { struct rte_eth_dev *eth_dev = sa->eth_dev; - struct rte_pci_device *pci_dev = SFC_DEV_TO_PCI(eth_dev); + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); efsys_bar_t *ebp = &sa->mem_bar; unsigned int i; struct rte_mem_resource *res; @@ -666,7 +666,7 @@ sfc_detach(struct sfc_adapter *sa) int sfc_probe(struct sfc_adapter *sa) { - struct rte_pci_device *pci_dev = SFC_DEV_TO_PCI(sa->eth_dev); + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(sa->eth_dev); efx_nic_t *enp; int rc; |