korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 05:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

qlcnic: reset pci function unconditionally during probe

Browse Source 
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>
This commit is contained in:
Rajesh Borundia 2010-12-16 22:59:02 +00:00 committed by David S. Miller
parent b5006dcb10
commit 1dc0f3c54c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/qlcnic/qlcnic.h
View File

@ -34,8 +34,8 @@
#define _QLCNIC_LINUX_MAJOR 5 #define _QLCNIC_LINUX_MAJOR 5
#define _QLCNIC_LINUX_MINOR 0 #define _QLCNIC_LINUX_MINOR 0
#define _QLCNIC_LINUX_SUBVERSION 13 #define _QLCNIC_LINUX_SUBVERSION 14
#define QLCNIC_LINUX_VERSIONID "5.0.13" #define QLCNIC_LINUX_VERSIONID "5.0.14"
#define QLCNIC_DRV_IDC_VER 0x01 #define QLCNIC_DRV_IDC_VER 0x01
#define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\
(_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

3
drivers/net/qlcnic/qlcnic_main.c
View File

@ -1468,7 +1468,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
uint8_t revision_id; uint8_t revision_id;
uint8_t pci_using_dac; uint8_t pci_using_dac;
char brd_name[QLCNIC_MAX_BOARD_NAME_LEN]; char brd_name[QLCNIC_MAX_BOARD_NAME_LEN];
u32 val;
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) if (err)
@ -1530,8 +1529,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err) if (err)
goto err_out_iounmap; 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); err = adapter->nic_ops->start_firmware(adapter);