summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2012-07-05 15:23:56 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2012-07-05 15:23:56 +0000
commitadb7993d08e2c618e1780921014a56e1fcd354c9 (patch)
tree73fda3f0bc9fb994f40bd55eef747bfe49e0c57e /sys
parent4cd2b471e698fb7c2290949d9cc373f4f25236f5 (diff)
Correct the jumbo setup code within brgphy(4). The code had a mistake
and was actually disabling the jumbo settings for the PHY. From Brad.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/mii/brgphy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index e2ae946fe12..fff5292e645 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: brgphy.c,v 1.94 2011/12/19 13:21:01 sthen Exp $ */
+/* $OpenBSD: brgphy.c,v 1.95 2012/07/05 15:23:55 sthen Exp $ */
/*
* Copyright (c) 2000
@@ -1128,12 +1128,12 @@ brgphy_jumbo_settings(struct mii_softc *sc)
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x7);
val = PHY_READ(sc, BRGPHY_MII_AUXCTL);
PHY_WRITE(sc, BRGPHY_MII_AUXCTL,
- val & ~(BRGPHY_AUXCTL_LONG_PKT | 0x7));
+ val | BRGPHY_AUXCTL_LONG_PKT);
}
val = PHY_READ(sc, BRGPHY_MII_PHY_EXTCTL);
PHY_WRITE(sc, BRGPHY_MII_PHY_EXTCTL,
- val & ~BRGPHY_PHY_EXTCTL_HIGH_LA);
+ val | BRGPHY_PHY_EXTCTL_HIGH_LA);
}
void