summaryrefslogtreecommitdiff
path: root/sys/dev/ic/re.c
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-04-20 00:59:45 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-04-20 00:59:45 +0000
commit8b6490748527ee2ec31fb7d27d5d805cdc3dc93e (patch)
tree2994a9b704fd744d54d6cc9576cc47c4e4196e78 /sys/dev/ic/re.c
parent17de794ed258c5d413448314a260a4aed1bf2751 (diff)
Remove redundant checks for the 8139C+ chipset, this code can only
be reached if using the 8139C+ chipset. ok dlg@
Diffstat (limited to 'sys/dev/ic/re.c')
-rw-r--r--sys/dev/ic/re.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index 941ed8c0ad2..1ba7d9d94fa 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.79 2008/04/20 00:42:27 brad Exp $ */
+/* $OpenBSD: re.c,v 1.80 2008/04/20 00:59:44 brad Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -433,7 +433,7 @@ re_miibus_readreg(struct device *dev, int phy, int reg)
return (0);
}
rval = CSR_READ_2(sc, re8139_reg);
- if (sc->sc_hwrev == RL_HWREV_8139CPLUS && re8139_reg == RL_BMCR) {
+ if (re8139_reg == RL_BMCR) {
/* 8139C+ has different bit layout. */
rval &= ~(BMCR_LOOP | BMCR_ISO);
}
@@ -464,10 +464,8 @@ re_miibus_writereg(struct device *dev, int phy, int reg, int data)
switch(reg) {
case MII_BMCR:
re8139_reg = RL_BMCR;
- if (sc->sc_hwrev == RL_HWREV_8139CPLUS) {
- /* 8139C+ has different bit layout. */
- data &= ~(BMCR_LOOP | BMCR_ISO);
- }
+ /* 8139C+ has different bit layout. */
+ data &= ~(BMCR_LOOP | BMCR_ISO);
break;
case MII_BMSR:
re8139_reg = RL_BMSR;