qlcnic: report valid speed and duplex status when link is down

Report valid link statistics when link is down.

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

2 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index cc228cf3d84b..6b2cf8bd16c3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/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/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 38669583840c..41d85efee422 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/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