diff options
| author | Rajesh Borundia <rajesh.borundia@qlogic.com> | 2010-12-16 22:59:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 11:39:02 -0800 |
| commit | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (patch) | |
| tree | d4f563cbba6bd4b3e5ebc138d8ecae05245d1bd1 /drivers/net/qlcnic | |
| parent | b5006dcb10a4b19e86f413b46787c55bd0d1277b (diff) | |
| download | blackbird-op-linux-1dc0f3c54ce1df957f99c17b145488fd03eb1a59.tar.gz blackbird-op-linux-1dc0f3c54ce1df957f99c17b145488fd03eb1a59.zip | |
qlcnic: reset pci function unconditionally during probe
Some boot code drivers dont have cleanup routine, so pci function
remains in unknown state prior to driver load. So during driver load
issue FLR unconditionally.
Update driver version to 5.0.14.
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic.h | 4 | ||||
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h index 4028d0c08f2c..9c2a02d204dc 100644 --- a/drivers/net/qlcnic/qlcnic.h +++ b/drivers/net/qlcnic/qlcnic.h @@ -34,8 +34,8 @@ #define _QLCNIC_LINUX_MAJOR 5 #define _QLCNIC_LINUX_MINOR 0 -#define _QLCNIC_LINUX_SUBVERSION 13 -#define QLCNIC_LINUX_VERSIONID "5.0.13" +#define _QLCNIC_LINUX_SUBVERSION 14 +#define QLCNIC_LINUX_VERSIONID "5.0.14" #define QLCNIC_DRV_IDC_VER 0x01 #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 788850e2ba4e..11e3a46c0911 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -1468,7 +1468,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) uint8_t revision_id; uint8_t pci_using_dac; char brd_name[QLCNIC_MAX_BOARD_NAME_LEN]; - u32 val; err = pci_enable_device(pdev); if (err) @@ -1530,9 +1529,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto err_out_iounmap; - val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE); - if (QLC_DEV_CHECK_ACTIVE(val, adapter->portnum)) - adapter->flags |= QLCNIC_NEED_FLR; + adapter->flags |= QLCNIC_NEED_FLR; err = adapter->nic_ops->start_firmware(adapter); if (err) { |
