summaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2006-04-29 18:58:01 -0700
committerDavid S. Miller <davem@davemloft.net>2006-04-29 18:58:01 -0700
commit58712ef9f2cbaaeac5b32ac11810a4bbd0eeacc5 (patch)
tree3e83bbcc8f9df47aaa507d5e72ef96fa31fa1d81 /drivers/net/tg3.c
parentc424cb249dae10fb7f118f89091f1329b62b92f4 (diff)
downloadop-kernel-dev-58712ef9f2cbaaeac5b32ac11810a4bbd0eeacc5.zip
op-kernel-dev-58712ef9f2cbaaeac5b32ac11810a4bbd0eeacc5.tar.gz
[TG3]: Reset chip when changing MAC address
Do the full chip reset when changing MAC address if ASF is enabled. ASF sometimes uses a different MAC address than the driver. Without the reset, the ASF MAC address may be overwritten when the driver's MAC address is changed. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index a307340..0ccfb63 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5732,9 +5732,23 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)
if (!netif_running(dev))
return 0;
- spin_lock_bh(&tp->lock);
- __tg3_set_mac_addr(tp);
- spin_unlock_bh(&tp->lock);
+ if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
+ /* Reset chip so that ASF can re-init any MAC addresses it
+ * needs.
+ */
+ tg3_netif_stop(tp);
+ tg3_full_lock(tp, 1);
+
+ tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
+ tg3_init_hw(tp);
+
+ tg3_netif_start(tp);
+ tg3_full_unlock(tp);
+ } else {
+ spin_lock_bh(&tp->lock);
+ __tg3_set_mac_addr(tp);
+ spin_unlock_bh(&tp->lock);
+ }
return 0;
}
OpenPOWER on IntegriCloud