Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc0f3c5 authored by Rajesh Borundia's avatar Rajesh Borundia Committed by David S. Miller
Browse files

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: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5006dcb

drivers/net/qlcnic/qlcnic.h

+2 −2
Original line number Diff line number Diff line
@@ -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))

drivers/net/qlcnic/qlcnic_main.c

+1 −4
Original line number Diff line number Diff line
@@ -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,8 +1529,6 @@ 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;



	err = adapter->nic_ops->start_firmware(adapter);