From d09fa37dd94d9f397f2e44441de9011881e782a8 Mon Sep 17 00:00:00 2001 From: Semen Ustimenko Date: Sat, 20 Apr 2002 12:35:38 +0000 Subject: 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 --- sys/dev/tx/if_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index dfb10c333d798..0ab0824cb10e2 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 -- cgit v1.3