mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-15 06:55:13 +08:00
qlcnic: Do not read QLCNIC_FW_CAPABILITY_MORE_CAPS bit for 83xx adapter
Only 82xx adapter advertises QLCNIC_FW_CAPABILITY_MORE_CAPS bit.
Reading this bit from 83xx adapter causes the driver to skip
extra capabilities registers.
Because of this, driver was not issuing qlcnic_fw_cmd_set_drv_version()
for 83xx adapter.
This bug was introduced in commit 8af3f33db0
("qlcnic: Add support for 'set driver version' in 83XX").
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
598c45b309
commit
d6994ca798
@ -2276,9 +2276,9 @@ int qlcnic_83xx_get_nic_info(struct qlcnic_adapter *adapter,
|
||||
temp = (cmd.rsp.arg[8] & 0x7FFE0000) >> 17;
|
||||
npar_info->max_linkspeed_reg_offset = temp;
|
||||
}
|
||||
if (npar_info->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS)
|
||||
memcpy(ahw->extra_capability, &cmd.rsp.arg[16],
|
||||
sizeof(ahw->extra_capability));
|
||||
|
||||
memcpy(ahw->extra_capability, &cmd.rsp.arg[16],
|
||||
sizeof(ahw->extra_capability));
|
||||
|
||||
out:
|
||||
qlcnic_free_mbx_args(&cmd);
|
||||
|
@ -1131,7 +1131,10 @@ qlcnic_initialize_nic(struct qlcnic_adapter *adapter)
|
||||
if (err == -EIO)
|
||||
return err;
|
||||
adapter->ahw->extra_capability[0] = temp;
|
||||
} else {
|
||||
adapter->ahw->extra_capability[0] = 0;
|
||||
}
|
||||
|
||||
adapter->ahw->max_mac_filters = nic_info.max_mac_filters;
|
||||
adapter->ahw->max_mtu = nic_info.max_mtu;
|
||||
|
||||
@ -2159,8 +2162,7 @@ void qlcnic_set_drv_version(struct qlcnic_adapter *adapter)
|
||||
else if (qlcnic_83xx_check(adapter))
|
||||
fw_cmd = QLCNIC_CMD_83XX_SET_DRV_VER;
|
||||
|
||||
if ((ahw->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) &&
|
||||
(ahw->extra_capability[0] & QLCNIC_FW_CAPABILITY_SET_DRV_VER))
|
||||
if (ahw->extra_capability[0] & QLCNIC_FW_CAPABILITY_SET_DRV_VER)
|
||||
qlcnic_fw_cmd_set_drv_version(adapter, fw_cmd);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user