Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

qlcnic: Fix API unlock

Log dump status.
Remove unmatched qlcnic_api_unlock call.
Update version to 5.0.26.

Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Manish chopra and committed by
David S. Miller
c47884e4 97048a1f

+3 -4
+1 -1
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
··· 37 37 #define _QLCNIC_LINUX_MAJOR 5 38 38 #define _QLCNIC_LINUX_MINOR 0 39 39 #define _QLCNIC_LINUX_SUBVERSION 25 40 - #define QLCNIC_LINUX_VERSIONID "5.0.25" 40 + #define QLCNIC_LINUX_VERSIONID "5.0.26" 41 41 #define QLCNIC_DRV_IDC_VER 0x01 42 42 #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ 43 43 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
+2 -3
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
··· 1152 1152 1153 1153 if (!fw_dump->clr) { 1154 1154 netdev_info(netdev, "Dump not available\n"); 1155 - qlcnic_api_unlock(adapter); 1156 1155 return -EINVAL; 1157 1156 } 1158 1157 /* Copy template header first */ ··· 1170 1171 vfree(fw_dump->data); 1171 1172 fw_dump->data = NULL; 1172 1173 fw_dump->clr = 0; 1173 - 1174 + netdev_info(netdev, "extracted the FW dump Successfully\n"); 1174 1175 return 0; 1175 1176 } 1176 1177 ··· 1188 1189 return ret; 1189 1190 } 1190 1191 if (fw_dump->clr) { 1191 - dev_info(&adapter->pdev->dev, 1192 + netdev_info(netdev, 1192 1193 "Previous dump not cleared, not forcing dump\n"); 1193 1194 return ret; 1194 1195 }