Re: [PATCH 3/6] tg3: Reset chip when changing MAC address

[David S. Miller]

From: Michael Chan [EMAIL PROTECTED]
Date: Fri, 28 Apr 2006 16:35:35 -0700

 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 [EMAIL PROTECTED]

A little heavy handed, but I can't think of another way to
deal with this.

Applied, thanks a lot.
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/6] tg3: Reset chip when changing MAC address

[Michael Chan]

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 [EMAIL PROTECTED]


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_d
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;
 }


-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html