summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2007-02-03 01:55:01 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2007-02-03 01:55:01 +0000
commit700c3feef68095acdb8fa061ca0961e008d72e74 (patch)
tree7df3fb1464a2fa1ce08c9572d0ddbae9f04e5413
parenta05a98733ba6bd0f869f65e500aab960717b82c0 (diff)
Don't set the RL_CFG1_FULLDUPLEX bit. The RL_CFG1_FULLDUPLEX bit in
config register 1 is only valid with the 8129 chipset. The rtl81x9reg.h header has this bit marked with a comment indicating it is for the 8129 chipset and the 8168/8169 datasheets confirm that this bit is not valid for the newer chipsets. From yongari@FreeBSD via brad. Tested by brad, kettenis and otto.
-rw-r--r--sys/dev/ic/re.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index c28fa3f8944..5782b996b32 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.64 2007/01/27 20:55:55 miod Exp $ */
+/* $OpenBSD: re.c,v 1.65 2007/02/03 01:55:00 krw Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -1901,7 +1901,7 @@ re_init(struct ifnet *ifp)
mii_mediachg(&sc->sc_mii);
- CSR_WRITE_1(sc, RL_CFG1, RL_CFG1_DRVLOAD|RL_CFG1_FULLDUPLEX);
+ CSR_WRITE_1(sc, RL_CFG1, CSR_READ_1(sc, RL_CFG1) | RL_CFG1_DRVLOAD);
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;