From e399fd3684c30cffe200031e73618193f8db35ab Mon Sep 17 00:00:00 2001
From: Sony Chacko <sony.chacko@qlogic.com>
Date: Fri, 3 Feb 2012 13:45:42 +0000
Subject: [PATCH] --- yaml --- r: 289867 b: refs/heads/master c:
 476a4b6d2543f0d9fa5205e0c25ebcd7973337bd h: refs/heads/master i:   289865:
 c21e2b802a5581dab2e6ee416464a3bcc25dd2a3   289863:
 73330ed2c1e43a6471e1fccaee7a0d7247ba07e6 v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 7 ++-----
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c    | 8 +++++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9c651dbe3959..948e56dc399b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 646779f1b4ade4acac6b49dbfa8be84a98ab85b4
+refs/heads/master: 476a4b6d2543f0d9fa5205e0c25ebcd7973337bd
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index cc228cf3d84b..6b2cf8bd16c3 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -155,7 +155,6 @@ qlcnic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
 	struct qlcnic_adapter *adapter = netdev_priv(dev);
 	int check_sfp_module = 0;
-	u16 pcifn = adapter->ahw->pci_func;
 
 	/* read which mode */
 	if (adapter->ahw->port_type == QLCNIC_GBE) {
@@ -194,10 +193,8 @@ qlcnic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 			goto skip;
 		}
 
-		val = QLCRD32(adapter, P3P_LINK_SPEED_REG(pcifn));
-		ethtool_cmd_speed_set(ecmd, P3P_LINK_SPEED_MHZ *
-				      P3P_LINK_SPEED_VAL(pcifn, val));
-		ecmd->duplex = DUPLEX_FULL;
+		ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
+		ecmd->duplex = DUPLEX_UNKNOWN;
 		ecmd->autoneg = AUTONEG_DISABLE;
 	} else
 		return -EIO;
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 38669583840c..41d85efee422 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -1369,7 +1369,13 @@ qlcnic_handle_linkevent(struct qlcnic_adapter *adapter,
 
 	adapter->module_type = module;
 	adapter->link_autoneg = autoneg;
-	adapter->link_speed = link_speed;
+
+	if (link_status) {
+		adapter->link_speed = link_speed;
+	} else {
+		adapter->link_speed = SPEED_UNKNOWN;
+		adapter->link_duplex = DUPLEX_UNKNOWN;
+	}
 }
 
 static void