diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 1999-04-12 21:14:36 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 1999-04-12 21:14:36 +0000 |
| commit | f55bddb79ca74ff8ed7c4f96dbb0555b0c07bc5c (patch) | |
| tree | 7d1f6ea1f5c5f58a4a111d4c6fde6bba981492bb /sys | |
| parent | 9904da58441db1c4d5d693bde5a14d31cb75fe0e (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pci/if_pn.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c index da8b11b8cdbd..7b8cc846a6ef 100644 --- a/sys/pci/if_pn.c +++ b/sys/pci/if_pn.c @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_pn.c,v 1.47 1999/04/12 02:44:28 wpaul Exp $ + * $Id: if_pn.c,v 1.48 1999/04/12 21:08:27 wpaul Exp $ */ /* @@ -97,7 +97,7 @@ #ifndef lint static const char rcsid[] = - "$Id: if_pn.c,v 1.47 1999/04/12 02:44:28 wpaul Exp $"; + "$Id: if_pn.c,v 1.48 1999/04/12 21:08:27 wpaul Exp $"; #endif /* @@ -874,12 +874,14 @@ static void pn_setcfg(sc, media) if (IFM_SUBTYPE(media) == IFM_100_TX) { PN_CLRBIT(sc, PN_NETCFG, PN_NETCFG_SPEEDSEL); - CSR_WRITE_4(sc, PN_GEN, PN_GEN_MUSTBEONE| - PN_GEN_SPEEDSEL|PN_GEN_100TX_LOOP); + if (sc->pn_pinfo == NULL) + CSR_WRITE_4(sc, PN_GEN, PN_GEN_MUSTBEONE| + PN_GEN_SPEEDSEL|PN_GEN_100TX_LOOP); } else { PN_SETBIT(sc, PN_NETCFG, PN_NETCFG_SPEEDSEL); - CSR_WRITE_4(sc, PN_GEN, - PN_GEN_MUSTBEONE|PN_GEN_100TX_LOOP); + if (sc->pn_pinfo == NULL) + CSR_WRITE_4(sc, PN_GEN, + PN_GEN_MUSTBEONE|PN_GEN_100TX_LOOP); } if ((media & IFM_GMASK) == IFM_FDX) |