diff options
| author | Wei Yang | 2014-04-14 03:51:19 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-04-14 05:12:15 +0200 |
| commit | befdf8978accecac2e0739e6b5075afc62db37fe (patch) | |
| tree | 58591373f00b298409be793cecfdaa9c9e60a5c1 /drivers/net/ethernet/mellanox/mlx4/mlx4.h | |
| parent | net: ipv4: current group_info should be put after using. (diff) | |
| download | kernel-qcow2-linux-befdf8978accecac2e0739e6b5075afc62db37fe.tar.gz kernel-qcow2-linux-befdf8978accecac2e0739e6b5075afc62db37fe.tar.xz kernel-qcow2-linux-befdf8978accecac2e0739e6b5075afc62db37fe.zip | |
net/mlx4_core: Preserve pci_dev_data after __mlx4_remove_one()
pci_match_id() just match the static pci_device_id, which may return NULL if
someone binds the driver to a device manually using
/sys/bus/pci/drivers/.../new_id.
This patch wrap up a helper function __mlx4_remove_one() which does the tear
down function but preserve the drv_data. Functions like
mlx4_pci_err_detected() and mlx4_restart_one() will call this one with out
releasing drvdata.
Fixes: 97a5221 "net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset".
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Amir Vadai <amirv@mellanox.com>
CC: Jack Morgenstein <jackm@dev.mellanox.co.il>
CC: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Acked-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index cf8be41abb36..f9c465101963 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h @@ -800,6 +800,7 @@ struct mlx4_priv { spinlock_t ctx_lock; int pci_dev_data; + int removed; struct list_head pgdir_list; struct mutex pgdir_mutex; |