diff options
| author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2014-03-27 02:28:31 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-27 20:35:33 +0100 |
| commit | 97a5221f56bad2e1c7e8ab55da4ac4748ef59c64 (patch) | |
| tree | 0762600e19c196843f868d158a44aa63b0fdc0f4 /drivers/net | |
| parent | core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors (diff) | |
| download | linux-97a5221f56bad2e1c7e8ab55da4ac4748ef59c64.tar.xz linux-97a5221f56bad2e1c7e8ab55da4ac4748ef59c64.zip | |
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>
Diffstat (limited to 'drivers/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, 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; } |