diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 2001-06-01 00:34:50 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 2001-06-01 00:34:50 +0000 |
| commit | 80157f80cdf4db13dd24276362146cda26d4c0b4 (patch) | |
| tree | 57c985527ddc93880088d5e546c091546dbda29c /sys | |
| parent | 0a315e79dfd60fb6c8c449b056b9558ae4611d65 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pci/if_xl.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 8cb2ef5107a34..92c92d9579eba 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -610,8 +610,7 @@ static void xl_miibus_statchg(dev) /* Set ASIC's duplex mode to match the PHY. */ XL_SEL_WIN(3); if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) - CSR_WRITE_1(sc, XL_W3_MAC_CTRL, - (CSR_READ_1(sc, XL_W3_MAC_CTRL) | XL_MACCTRL_DUPLEX)); + CSR_WRITE_1(sc, XL_W3_MAC_CTRL, XL_MACCTRL_DUPLEX); else CSR_WRITE_1(sc, XL_W3_MAC_CTRL, (CSR_READ_1(sc, XL_W3_MAC_CTRL) & ~XL_MACCTRL_DUPLEX)); @@ -994,8 +993,7 @@ static void xl_setmode(sc, media) IFM_SUBTYPE(media) == IFM_100_FX) { printf("full duplex\n"); XL_SEL_WIN(3); - CSR_WRITE_1(sc, XL_W3_MAC_CTRL, - (CSR_READ_1(sc, XL_W3_MAC_CTRL) | XL_MACCTRL_DUPLEX)); + CSR_WRITE_1(sc, XL_W3_MAC_CTRL, XL_MACCTRL_DUPLEX); } else { printf("half duplex\n"); XL_SEL_WIN(3); @@ -2653,13 +2651,6 @@ static void xl_init(xsc) else CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_COAX_STOP); - /* - * Allow reception of large packets to make - * people who use 802.1q VLANs happy. - */ - CSR_WRITE_1(sc, XL_W3_MAC_CTRL, - (CSR_READ_1(sc, XL_W3_MAC_CTRL) | XL_MACCTRL_LARGE_PACK)); - /* increase packet size to allow reception of 802.1q or ISL packets */ if (sc->xl_type == XL_TYPE_905B) CSR_WRITE_2(sc, XL_W3_MAXPKTSIZE, XL_PACKET_SIZE); |