1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 994658d26b8e..f7da3bf2fa09 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5537,6 +5537,9 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
 
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
+        if (!netif_running(dev))
+                return 0;
+
         spin_lock_bh(&tp->lock);
         __tg3_set_mac_addr(tp);
         spin_unlock_bh(&tp->lock);
@@ -7192,6 +7195,9 @@ static void tg3_set_rx_mode(struct net_device *dev)
 {
         struct tg3 *tp = netdev_priv(dev);
 
+        if (!netif_running(dev))
+                return;
+
         tg3_full_lock(tp, 0);
         __tg3_set_rx_mode(dev);
         tg3_full_unlock(tp);