diff options
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 @@ | |||
34 | 34 | ||
35 | #define _QLCNIC_LINUX_MAJOR 5 | 35 | #define _QLCNIC_LINUX_MAJOR 5 |
36 | #define _QLCNIC_LINUX_MINOR 0 | 36 | #define _QLCNIC_LINUX_MINOR 0 |
37 | #define _QLCNIC_LINUX_SUBVERSION 13 | 37 | #define _QLCNIC_LINUX_SUBVERSION 14 |
38 | #define QLCNIC_LINUX_VERSIONID "5.0.13" | 38 | #define QLCNIC_LINUX_VERSIONID "5.0.14" |
39 | #define QLCNIC_DRV_IDC_VER 0x01 | 39 | #define QLCNIC_DRV_IDC_VER 0x01 |
40 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ | 40 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ |
41 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) | 41 | (_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) | |||
1468 | uint8_t revision_id; | 1468 | uint8_t revision_id; |
1469 | uint8_t pci_using_dac; | 1469 | uint8_t pci_using_dac; |
1470 | char brd_name[QLCNIC_MAX_BOARD_NAME_LEN]; | 1470 | char brd_name[QLCNIC_MAX_BOARD_NAME_LEN]; |
1471 | u32 val; | ||
1472 | 1471 | ||
1473 | err = pci_enable_device(pdev); | 1472 | err = pci_enable_device(pdev); |
1474 | if (err) | 1473 | if (err) |
@@ -1530,9 +1529,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1530 | if (err) | 1529 | if (err) |
1531 | goto err_out_iounmap; | 1530 | goto err_out_iounmap; |
1532 | 1531 | ||
1533 | val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE); | 1532 | adapter->flags |= QLCNIC_NEED_FLR; |
1534 | if (QLC_DEV_CHECK_ACTIVE(val, adapter->portnum)) | ||
1535 | adapter->flags |= QLCNIC_NEED_FLR; | ||
1536 | 1533 | ||
1537 | err = adapter->nic_ops->start_firmware(adapter); | 1534 | err = adapter->nic_ops->start_firmware(adapter); |
1538 | if (err) { | 1535 | if (err) { |