From 40b56c25b39e8b709d7ecf2e21417efb157cd482 Mon Sep 17 00:00:00 2001
From: Manfred Spraul <manfred@colorfullife.com>
Date: Sat, 6 Aug 2005 23:47:55 +0200
Subject: [PATCH] --- yaml --- r: 6107 b: refs/heads/master c:
 1b1b3c9b6d346d441a99e2de0b34f3ba93963ad8 h: refs/heads/master i:   6105:
 b00646faf07bface6e3b777f47ff2afdf20322dd   6103:
 d876063e4143d5098b2d13d513da597e29e85812 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/forcedeth.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ee6df1e6d6d..ed2aec9db1ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3bc068022b968a3042b48eb9a8e8b0418fb9cdd
+refs/heads/master: 1b1b3c9b6d346d441a99e2de0b34f3ba93963ad8
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
index f165ae973985..7d93948aec83 100644
--- a/trunk/drivers/net/forcedeth.c
+++ b/trunk/drivers/net/forcedeth.c
@@ -93,6 +93,8 @@
  *      0.40: 19 Jul 2005: Add support for mac address change.
  *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
  *			   of nv_remove
+ *      0.42: 06 Aug 2005: Fix lack of link speed initialization
+ *			   in the second (and later) nv_open call
  *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
@@ -2178,6 +2180,9 @@ static int nv_open(struct net_device *dev)
 		writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
 		dprintk(KERN_INFO "startup: got 0x%08x.\n", miistat);
 	}
+	/* set linkspeed to invalid value, thus force nv_update_linkspeed
+	 * to init hw */
+	np->linkspeed = 0;
 	ret = nv_update_linkspeed(dev);
 	nv_start_rx(dev);
 	nv_start_tx(dev);