Commit e75f7c90 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

[TG3]: Add some missing netif_running() checks

Add missing netif_running() checks in tg3's dev->set_multicast_list()
and dev->set_mac_address(). If not netif_running(), these 2 calls can
simply return 0 after storing the new settings if required.
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e7b1368
...@@ -5537,6 +5537,9 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p) ...@@ -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); memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
if (!netif_running(dev))
return 0;
spin_lock_bh(&tp->lock); spin_lock_bh(&tp->lock);
__tg3_set_mac_addr(tp); __tg3_set_mac_addr(tp);
spin_unlock_bh(&tp->lock); spin_unlock_bh(&tp->lock);
...@@ -7192,6 +7195,9 @@ static void tg3_set_rx_mode(struct net_device *dev) ...@@ -7192,6 +7195,9 @@ static void tg3_set_rx_mode(struct net_device *dev)
{ {
struct tg3 *tp = netdev_priv(dev); struct tg3 *tp = netdev_priv(dev);
if (!netif_running(dev))
return;
tg3_full_lock(tp, 0); tg3_full_lock(tp, 0);
__tg3_set_rx_mode(dev); __tg3_set_rx_mode(dev);
tg3_full_unlock(tp); tg3_full_unlock(tp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment