32c32
< __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_mac.c 294253 2016-01-18 06:19:28Z arybchik $");
---
> __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_mac.c 299320 2016-05-10 07:01:06Z arybchik $");
45c45
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
51c51
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */
815,853d814
< #if EFSYS_OPT_FALCON
< switch (epp->ep_link_mode) {
< #if EFSYS_OPT_MAC_FALCON_GMAC
< case EFX_LINK_100HDX:
< case EFX_LINK_100FDX:
< case EFX_LINK_1000HDX:
< case EFX_LINK_1000FDX:
< type = EFX_MAC_FALCON_GMAC;
< goto chosen;
< #endif /* EFSYS_OPT_FALCON_GMAC */
<
< #if EFSYS_OPT_MAC_FALCON_XMAC
< case EFX_LINK_10000FDX:
< type = EFX_MAC_FALCON_XMAC;
< goto chosen;
< #endif /* EFSYS_OPT_FALCON_XMAC */
<
< default:
< #if EFSYS_OPT_MAC_FALCON_GMAC && EFSYS_OPT_MAC_FALCON_XMAC
< /* Only initialise a MAC supported by the PHY */
< if (epp->ep_phy_cap_mask &
< ((1 << EFX_PHY_CAP_1000FDX) |
< (1 << EFX_PHY_CAP_1000HDX) |
< (1 << EFX_PHY_CAP_100FDX) |
< (1 << EFX_PHY_CAP_100HDX) |
< (1 << EFX_PHY_CAP_10FDX) |
< (1 << EFX_PHY_CAP_10FDX)))
< type = EFX_MAC_FALCON_GMAC;
< else
< type = EFX_MAC_FALCON_XMAC;
< #elif EFSYS_OPT_MAC_FALCON_GMAC
< type = EFX_MAC_FALCON_GMAC;
< #else
< type = EFX_MAC_FALCON_XMAC;
< #endif
< goto chosen;
< }
< #endif /* EFSYS_OPT_FALCON */
<
879c840
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
946c907
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */