From c2742441f1a5faba43f6603e0300d1e69dbe9d36 Mon Sep 17 00:00:00 2001
From: yongari <yongari@FreeBSD.org>
Date: Thu, 13 Jan 2011 22:52:57 +0000
Subject: re_reset() should be called only after setting device specific
 features.

---
 sys/dev/re/if_re.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys/dev/re')

diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 30d9df5..f9c72b0 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -1258,11 +1258,6 @@ re_attach(device_t dev)
 		CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF);
 	}
 
-	/* Reset the adapter. */
-	RL_LOCK(sc);
-	re_reset(sc);
-	RL_UNLOCK(sc);
-
 	hw_rev = re_hwrevs;
 	hwrev = CSR_READ_4(sc, RL_TXCFG);
 	switch (hwrev & 0x70000000) {
@@ -1366,6 +1361,11 @@ re_attach(device_t dev)
 		break;
 	}
 
+	/* Reset the adapter. */
+	RL_LOCK(sc);
+	re_reset(sc);
+	RL_UNLOCK(sc);
+
 	/* Enable PME. */
 	CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE);
 	cfg = CSR_READ_1(sc, RL_CFG1);
-- 
cgit v1.1