diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2012-07-04 13:24:42 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2012-07-04 13:24:42 +0000 |
| commit | 3f721e334c0877d045d1234d6e7bdcb228fed6cf (patch) | |
| tree | 38d31232b997a3c7e072adc64c98b52f2363666b | |
| parent | 8411b5c30497c05bd92bfa1069841318e921ea93 (diff) | |
Invert the logic for detecting fibre interface media adapters.
Only the BCM5700-BCM5704 adapters had TBI interfaces for fibre
and anyting newer uses the MII interface.
From Brad.
| -rw-r--r-- | sys/dev/pci/if_bge.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 4506e9e0a5e..d63a42a7cac 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.310 2012/07/04 08:06:33 kettenis Exp $ */ +/* $OpenBSD: if_bge.c,v 1.311 2012/07/04 13:24:41 kettenis Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -2208,11 +2208,10 @@ bge_attach(struct device *parent, struct device *self, void *aux) /* The SysKonnect SK-9D41 is a 1000baseSX card. */ if (PCI_PRODUCT(subid) == SK_SUBSYSID_9D41 || (hwcfg & BGE_HWCFG_MEDIA) == BGE_MEDIA_FIBER) { - if (BGE_IS_5714_FAMILY(sc) || - BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5717) - sc->bge_flags |= BGE_PHY_FIBER_MII; - else + if (BGE_IS_5700_FAMILY(sc)) sc->bge_flags |= BGE_PHY_FIBER_TBI; + else + sc->bge_flags |= BGE_PHY_FIBER_MII; } /* Hookup IRQ last. */ |