diff options
author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2014-03-26 21:28:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-27 15:35:33 -0400 |
commit | 97a5221f56bad2e1c7e8ab55da4ac4748ef59c64 (patch) | |
tree | 0762600e19c196843f868d158a44aa63b0fdc0f4 | |
parent | 36d5fe6a000790f56039afe26834265db0a3ad4c (diff) |
net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 936c15364739..d413e60071d4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
@@ -2681,7 +2681,11 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev, | |||
2681 | 2681 | ||
2682 | static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev) | 2682 | static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev) |
2683 | { | 2683 | { |
2684 | int ret = __mlx4_init_one(pdev, 0); | 2684 | const struct pci_device_id *id; |
2685 | int ret; | ||
2686 | |||
2687 | id = pci_match_id(mlx4_pci_table, pdev); | ||
2688 | ret = __mlx4_init_one(pdev, id->driver_data); | ||
2685 | 2689 | ||
2686 | return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; | 2690 | return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; |
2687 | } | 2691 | } |