tg3: Fix stats while interface is down

If the tg3 interface is down, the driver will return ethtool stats
uninitialized.  This patch zeroes out the destination stat buffer in
such a case.

(cherry picked from commit b546e46f5c9f19a921d6f62db80f2e9371bc0558)
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 454b3c5aea0fbdea1506d2bde44f4b4dd30979d6..1da1a05c26556c45ad4a7827e0aa2a7b7571cef0 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10160,9 +10160,6 @@ static struct tg3_ethtool_stats *tg3_get_estats(struct tg3 *tp,
        struct tg3_ethtool_stats *old_estats = &tp->estats_prev;
        struct tg3_hw_stats *hw_stats = tp->hw_stats;
 
-       if (!hw_stats)
-               return old_estats;
-
        ESTAT_ADD(rx_octets);
        ESTAT_ADD(rx_fragments);
        ESTAT_ADD(rx_ucast_packets);
@@ -11035,7 +11032,10 @@ static void tg3_get_ethtool_stats(struct net_device *dev,
 {
        struct tg3 *tp = netdev_priv(dev);
 
-       tg3_get_estats(tp, (struct tg3_ethtool_stats *)tmp_stats);
+       if (tp->hw_stats)
+               tg3_get_estats(tp, (struct tg3_ethtool_stats *)tmp_stats);
+       else
+               memset(tmp_stats, 0, sizeof(struct tg3_ethtool_stats));
 }
 
 static __be32 *tg3_vpd_readblock(struct tg3 *tp, u32 *vpdlen)