diff options
| author | semenu <semenu@FreeBSD.org> | 2002-04-20 12:35:38 +0000 |
|---|---|---|
| committer | semenu <semenu@FreeBSD.org> | 2002-04-20 12:35:38 +0000 |
| commit | 01626389586f86f0e0a0934cdb1a301ae08803c6 (patch) | |
| tree | 47d736deee53d4803200620690ac12e8b05f1f2c /sys | |
| parent | fdbc3fd42a5dc889e8c27bdd9f3a79026e096e03 (diff) | |
| download | FreeBSD-src-01626389586f86f0e0a0934cdb1a301ae08803c6.zip FreeBSD-src-01626389586f86f0e0a0934cdb1a301ae08803c6.tar.gz | |
Merge ``&& must be ||'' bug noticed and fixed in OpenBSD. The only ill effect
was if_baudrate being always 10Mbit.
Obtained from: OpenBSD
MFC after: 1 day
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/tx/if_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index dfb10c3..0ab0824 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -1349,7 +1349,7 @@ epic_miibus_statchg(dev) } /* Update baudrate */ - if (IFM_SUBTYPE(media) == IFM_100_TX && + if (IFM_SUBTYPE(media) == IFM_100_TX || IFM_SUBTYPE(media) == IFM_100_FX) sc->sc_if.if_baudrate = 100000000; else |
