diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2014-03-13 13:11:31 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2014-03-13 13:11:31 +0000 |
| commit | 2167b2367ecd1e508e2c61b3ebae2738da095758 (patch) | |
| tree | 273b3f82db68d292bc19c2879689964148d9f9a3 | |
| parent | 5afd26a0f0a34c1687168d9dbc107bb81e1fd1de (diff) | |
Missed removing some bits with rev 1.147.
ok sthen@
| -rw-r--r-- | sys/dev/ic/re.c | 22 | ||||
| -rw-r--r-- | sys/dev/ic/rtl81x9reg.h | 3 |
2 files changed, 4 insertions, 21 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 8663779d89c..63556e7d6f5 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.148 2014/03/08 22:37:32 brad Exp $ */ +/* $OpenBSD: re.c,v 1.149 2014/03/13 13:11:30 brad Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -1869,15 +1869,7 @@ re_init(struct ifnet *ifp) /* * Set the initial TX and RX configuration. */ - if (sc->rl_testmode) { - if (sc->sc_hwrev == RL_HWREV_8139CPLUS) - CSR_WRITE_4(sc, RL_TXCFG, - RL_TXCFG_CONFIG|RL_LOOPTEST_ON_CPLUS); - else - CSR_WRITE_4(sc, RL_TXCFG, - RL_TXCFG_CONFIG|RL_LOOPTEST_ON); - } else - CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG); + CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG); CSR_WRITE_1(sc, RL_EARLY_TX_THRESH, 16); @@ -1894,10 +1886,7 @@ re_init(struct ifnet *ifp) /* * Enable interrupts. */ - if (sc->rl_testmode) - CSR_WRITE_2(sc, RL_IMR, 0); - else - re_setup_intr(sc, 1, sc->rl_imtype); + re_setup_intr(sc, 1, sc->rl_imtype); CSR_WRITE_2(sc, RL_ISR, sc->rl_imtype); /* Start RX/TX process. */ @@ -1914,11 +1903,6 @@ re_init(struct ifnet *ifp) if (sc->sc_hwrev != RL_HWREV_8139CPLUS) CSR_WRITE_2(sc, RL_MAXRXPKTLEN, 16383); - if (sc->rl_testmode) { - splx(s); - return (0); - } - mii_mediachg(&sc->sc_mii); CSR_WRITE_1(sc, RL_CFG1, CSR_READ_1(sc, RL_CFG1) | RL_CFG1_DRVLOAD); diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h index 3fa111d0b04..982f0ce3e14 100644 --- a/sys/dev/ic/rtl81x9reg.h +++ b/sys/dev/ic/rtl81x9reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9reg.h,v 1.79 2014/03/08 22:37:32 brad Exp $ */ +/* $OpenBSD: rtl81x9reg.h,v 1.80 2014/03/13 13:11:30 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -835,7 +835,6 @@ struct rl_softc { struct mbuf *rl_head; struct mbuf *rl_tail; u_int32_t rl_rxlenmask; - int rl_testmode; struct timeout timer_handle; int rl_txstart; |