Skip to content

Commit 1dc0f3c

Browse files
Rajesh Borundiadavem330
authored andcommitted
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>
1 parent b5006dc commit 1dc0f3c

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

drivers/net/qlcnic/qlcnic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
#define _QLCNIC_LINUX_MAJOR 5
3636
#define _QLCNIC_LINUX_MINOR 0
37-
#define _QLCNIC_LINUX_SUBVERSION 13
38-
#define QLCNIC_LINUX_VERSIONID "5.0.13"
37+
#define _QLCNIC_LINUX_SUBVERSION 14
38+
#define QLCNIC_LINUX_VERSIONID "5.0.14"
3939
#define QLCNIC_DRV_IDC_VER 0x01
4040
#define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\
4141
(_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

drivers/net/qlcnic/qlcnic_main.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
14681468
uint8_t revision_id;
14691469
uint8_t pci_using_dac;
14701470
char brd_name[QLCNIC_MAX_BOARD_NAME_LEN];
1471-
u32 val;
14721471

14731472
err = pci_enable_device(pdev);
14741473
if (err)
@@ -1530,9 +1529,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
15301529
if (err)
15311530
goto err_out_iounmap;
15321531

1533-
val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
1534-
if (QLC_DEV_CHECK_ACTIVE(val, adapter->portnum))
1535-
adapter->flags |= QLCNIC_NEED_FLR;
1532+
adapter->flags |= QLCNIC_NEED_FLR;
15361533

15371534
err = adapter->nic_ops->start_firmware(adapter);
15381535
if (err) {

0 commit comments

Comments
 (0)