From 72a8b7bcb94fe733cedab1dd06d52484551d2855 Mon Sep 17 00:00:00 2001
From: Manish chopra <manish.chopra@qlogic.com>
Date: Thu, 28 Jun 2012 20:12:21 +0000
Subject: [PATCH] --- yaml --- r: 314727 b: refs/heads/master c:
 a777c892cea917b6c67c61f8dff47d8caae7b8a1 h: refs/heads/master i:   314725:
 c1eee02ff02297544d6a2e2bcd03271a572b7f90   314723:
 499d9838172ce935df996f04f5b3383f3bb2157b   314719:
 88d4a56a05f7daea71bfc7ecfcc60467d9958f7b v: v3

---
 [refs]                                              |  2 +-
 .../drivers/net/ethernet/qlogic/netxen/netxen_nic.h |  4 ++--
 .../net/ethernet/qlogic/netxen/netxen_nic_ethtool.c | 13 ++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7948a52172e8..af5ca2627ae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0087b29f77176480c27c203988b5704847d617c
+refs/heads/master: a777c892cea917b6c67c61f8dff47d8caae7b8a1
diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index 37ccbe54e62d..eb3dfdbb642b 100644
--- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 79
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.79"
+#define _NETXEN_NIC_LINUX_SUBVERSION 80
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.80"
 
 #define NETXEN_VERSION_CODE(a, b, c)	(((a) << 24) + ((b) << 16) + (c))
 #define _major(v)	(((v) >> 24) & 0xff)
diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index 9103e3e36c28..10468e7932dd 100644
--- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
+++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
@@ -826,7 +826,12 @@ netxen_get_dump_flag(struct net_device *netdev, struct ethtool_dump *dump)
 		dump->len = mdump->md_dump_size;
 	else
 		dump->len = 0;
-	dump->flag = mdump->md_capture_mask;
+
+	if (!mdump->md_enabled)
+		dump->flag = ETH_FW_DUMP_DISABLE;
+	else
+		dump->flag = mdump->md_capture_mask;
+
 	dump->version = adapter->fw_version;
 	return 0;
 }
@@ -840,8 +845,10 @@ netxen_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 
 	switch (val->flag) {
 	case NX_FORCE_FW_DUMP_KEY:
-		if (!mdump->md_enabled)
-			mdump->md_enabled = 1;
+		if (!mdump->md_enabled) {
+			netdev_info(netdev, "FW dump not enabled\n");
+			return 0;
+		}
 		if (adapter->fw_mdump_rdy) {
 			netdev_info(netdev, "Previous dump not cleared, not forcing dump\n");
 			return 0;