diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2010-08-07 23:56:43 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2010-08-07 23:56:43 +0000 |
| commit | 2d1aea3355b8b7844c7205013513a5506d2f62ca (patch) | |
| tree | 2253b554fc257392a1a640a3d49dd2c30cfd81aa | |
| parent | 0f2abeb396a84845a7e606c86f416f7694e336eb (diff) | |
Revert 1.123. Hangs RTL8168C/8111C (0x3c00) after
ifconfig re0 up
ifconfig re0 down
dhclient re0
ok krw@, deraadt@
| -rw-r--r-- | sys/dev/ic/re.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 42cd3da7987..0c15ff612f6 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.125 2010/08/07 03:50:01 krw Exp $ */ +/* $OpenBSD: re.c,v 1.126 2010/08/07 23:56:42 naddy Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -2178,12 +2178,7 @@ re_stop(struct ifnet *ifp) mii_down(&sc->sc_mii); - if (sc->rl_flags & RL_FLAG_CMDSTOP) - CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_STOPREQ | RL_CMD_TX_ENB | - RL_CMD_RX_ENB); - else - CSR_WRITE_1(sc, RL_COMMAND, 0x00); - DELAY(1000); + CSR_WRITE_1(sc, RL_COMMAND, 0x00); CSR_WRITE_2(sc, RL_IMR, 0x0000); CSR_WRITE_2(sc, RL_ISR, 0xFFFF); |