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.
No change for anything currently supported.
OK?
Index: if_bge.c
===================================================================
RCS file: /home/cvs/src/sys/dev/pci/if_bge.c,v
retrieving revision 1.309
diff -u -p -r1.309 if_bge.c
--- if_bge.c 28 Jun 2012 11:52:15 -0000 1.309
+++ if_bge.c 1 Jul 2012 03:50:36 -0000
@@ -2206,11 +2206,10 @@ bge_attach(struct device *parent, struct
/* 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. */
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
