From 2e998f14c4ab068d9815d24d1a2a2a0d7a0f3f2f Mon Sep 17 00:00:00 2001
From: Manish chopra <manish.chopra@qlogic.com>
Date: Fri, 3 Feb 2012 13:45:44 +0000
Subject: [PATCH] --- yaml --- r: 289869 b: refs/heads/master c:
 c47884e4551cdea35f5bed60d0ae53d9b6c73dc2 h: refs/heads/master i:   289867:
 e399fd3684c30cffe200031e73618193f8db35ab v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h         | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bd378219b182..43115b2dab4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97048a1f2b2f0ca2b2f690b551d5e97eeb94a0e9
+refs/heads/master: c47884e4551cdea35f5bed60d0ae53d9b6c73dc2
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 60976fc4ccc6..2b5af22419a5 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -37,7 +37,7 @@
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
 #define _QLCNIC_LINUX_SUBVERSION 25
-#define QLCNIC_LINUX_VERSIONID  "5.0.25"
+#define QLCNIC_LINUX_VERSIONID  "5.0.26"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
 		 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 6b2cf8bd16c3..30dcbfba8f24 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -1152,7 +1152,6 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
 
 	if (!fw_dump->clr) {
 		netdev_info(netdev, "Dump not available\n");
-		qlcnic_api_unlock(adapter);
 		return -EINVAL;
 	}
 	/* Copy template header first */
@@ -1171,7 +1170,7 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
 	vfree(fw_dump->data);
 	fw_dump->data = NULL;
 	fw_dump->clr = 0;
-
+	netdev_info(netdev, "extracted the FW dump Successfully\n");
 	return 0;
 }
 
@@ -1189,7 +1188,7 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 			return ret;
 		}
 		if (fw_dump->clr) {
-			dev_info(&adapter->pdev->dev,
+			netdev_info(netdev,
 			"Previous dump not cleared, not forcing dump\n");
 			return ret;
 		}