diff options
author | Manish chopra <manish.chopra@qlogic.com> | 2012-02-03 08:45:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-04 15:59:30 -0500 |
commit | c47884e4551cdea35f5bed60d0ae53d9b6c73dc2 (patch) | |
tree | 11be9dea7e6b845b44ca18fb4aaf01dbc6422cd8 /drivers/net/ethernet/qlogic | |
parent | 97048a1f2b2f0ca2b2f690b551d5e97eeb94a0e9 (diff) |
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>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h index 60976fc4ccc6..2b5af22419a5 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #define _QLCNIC_LINUX_MAJOR 5 | 37 | #define _QLCNIC_LINUX_MAJOR 5 |
38 | #define _QLCNIC_LINUX_MINOR 0 | 38 | #define _QLCNIC_LINUX_MINOR 0 |
39 | #define _QLCNIC_LINUX_SUBVERSION 25 | 39 | #define _QLCNIC_LINUX_SUBVERSION 25 |
40 | #define QLCNIC_LINUX_VERSIONID "5.0.25" | 40 | #define QLCNIC_LINUX_VERSIONID "5.0.26" |
41 | #define QLCNIC_DRV_IDC_VER 0x01 | 41 | #define QLCNIC_DRV_IDC_VER 0x01 |
42 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ | 42 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ |
43 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) | 43 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index 6b2cf8bd16c3..30dcbfba8f24 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |||
@@ -1152,7 +1152,6 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump, | |||
1152 | 1152 | ||
1153 | if (!fw_dump->clr) { | 1153 | if (!fw_dump->clr) { |
1154 | netdev_info(netdev, "Dump not available\n"); | 1154 | netdev_info(netdev, "Dump not available\n"); |
1155 | qlcnic_api_unlock(adapter); | ||
1156 | return -EINVAL; | 1155 | return -EINVAL; |
1157 | } | 1156 | } |
1158 | /* Copy template header first */ | 1157 | /* Copy template header first */ |
@@ -1171,7 +1170,7 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump, | |||
1171 | vfree(fw_dump->data); | 1170 | vfree(fw_dump->data); |
1172 | fw_dump->data = NULL; | 1171 | fw_dump->data = NULL; |
1173 | fw_dump->clr = 0; | 1172 | fw_dump->clr = 0; |
1174 | 1173 | netdev_info(netdev, "extracted the FW dump Successfully\n"); | |
1175 | return 0; | 1174 | return 0; |
1176 | } | 1175 | } |
1177 | 1176 | ||
@@ -1189,7 +1188,7 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val) | |||
1189 | return ret; | 1188 | return ret; |
1190 | } | 1189 | } |
1191 | if (fw_dump->clr) { | 1190 | if (fw_dump->clr) { |
1192 | dev_info(&adapter->pdev->dev, | 1191 | netdev_info(netdev, |
1193 | "Previous dump not cleared, not forcing dump\n"); | 1192 | "Previous dump not cleared, not forcing dump\n"); |
1194 | return ret; | 1193 | return ret; |
1195 | } | 1194 | } |