* [PATCH] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset
@ 2014-03-27 1:28 Wei Yang
2014-03-27 19:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yang @ 2014-03-27 1:28 UTC (permalink / raw)
To: jackm, ogerlitz, davem, netdev; +Cc: Wei Yang
The second parameter of __mlx4_init_one() is used to identify whether the
pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
this information is missed.
This patch match the pci_dev with mlx4_pci_table and passes the
pci_device_id.driver_data to __mlx4_init_one() in mlx4_pci_slot_reset().
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
drivers/net/ethernet/mellanox/mlx4/main.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index d711158..aa54ef7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2670,7 +2670,11 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
{
- int ret = __mlx4_init_one(pdev, 0);
+ const struct pci_device_id *id;
+ int ret;
+
+ id = pci_match_id(mlx4_pci_table, pdev);
+ ret = __mlx4_init_one(pdev, id->driver_data);
return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset
2014-03-27 1:28 [PATCH] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset Wei Yang
@ 2014-03-27 19:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-03-27 19:36 UTC (permalink / raw)
To: weiyang; +Cc: jackm, ogerlitz, netdev
From: Wei Yang <weiyang@linux.vnet.ibm.com>
Date: Thu, 27 Mar 2014 09:28:31 +0800
> The second parameter of __mlx4_init_one() is used to identify whether the
> pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
> this information is missed.
>
> This patch match the pci_dev with mlx4_pci_table and passes the
> pci_device_id.driver_data to __mlx4_init_one() in mlx4_pci_slot_reset().
>
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-27 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-27 1:28 [PATCH] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset Wei Yang
2014-03-27 19:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).