re_reset() should be called only after setting device specific

features.
This commit is contained in:
Pyun YongHyeon 2011-01-13 22:52:57 +00:00
parent d3b181ae81
commit 9325262669

View File

@ -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);