Skip to content

Commit

Permalink
qlcnic: reset pci function unconditionally during probe
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rajesh Borundia authored and David S. Miller committed Dec 17, 2010
1 parent b5006dc commit 1dc0f3c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions drivers/net/qlcnic/qlcnic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
5 changes: 1 addition & 4 deletions drivers/net/qlcnic/qlcnic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 1dc0f3c

Please sign in to comment.