summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2012-10-22 09:19:18 +0000
committerBrad Smith <brad@cvs.openbsd.org>2012-10-22 09:19:18 +0000
commit2cff86c2b2a7d5d03d92f60381f4d7338424aa5e (patch)
tree6b610f6969c1c5c625c1a90af5f7919841bb8ebf /sys
parent1857a61ce8732dba23b613865066ef03c96570f9 (diff)
Add flow control support.
ok jsg@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_jme.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 6286e777c1f..25c954fda11 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_jme.c,v 1.27 2012/02/28 03:58:16 jsg Exp $ */
+/* $OpenBSD: if_jme.c,v 1.28 2012/10/22 09:19:17 brad Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -634,7 +634,7 @@ jme_attach(struct device *parent, struct device *self, void *aux)
ifmedia_init(&sc->sc_miibus.mii_media, 0, jme_mediachange,
jme_mediastatus);
mii_attach(self, &sc->sc_miibus, 0xffffffff, MII_PHY_ANY,
- MII_OFFSET_ANY, 0);
+ MII_OFFSET_ANY, MIIF_DOPAUSE);
if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) {
printf("%s: no PHY found!\n", sc->sc_dev.dv_xname);
@@ -1343,12 +1343,10 @@ jme_mac_config(struct jme_softc *sc)
txmac &= ~(TXMAC_COLL_ENB | TXMAC_CARRIER_SENSE |
TXMAC_BACKOFF | TXMAC_CARRIER_EXT |
TXMAC_FRAME_BURST);
-#ifdef notyet
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
txpause |= TXPFC_PAUSE_ENB;
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
rxmac |= RXMAC_FC_ENB;
-#endif
/* Disable retry transmit timer/retry limit. */
CSR_WRITE_4(sc, JME_TXTRHD, CSR_READ_4(sc, JME_TXTRHD) &
~(TXTRHD_RT_PERIOD_ENB | TXTRHD_RT_LIMIT_ENB));