diff options
| author | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-09 12:11:05 -0200 |
| commit | 681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (patch) | |
| tree | 08368e0c4dcea4baa16f4a34b2cc104c42e1ed27 /sys/dev/sfxge/common/efx_phy.c | |
| parent | cbeab2a9b6b7ac70992175202f35fcc05a5821d5 (diff) | |
| parent | 91f6edbb8913d163d5c16fb615e84baf8a16d390 (diff) | |
| download | FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.zip FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev/sfxge/common/efx_phy.c')
| -rw-r--r-- | sys/dev/sfxge/common/efx_phy.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/sfxge/common/efx_phy.c b/sys/dev/sfxge/common/efx_phy.c index a265d7c..1db2300 100644 --- a/sys/dev/sfxge/common/efx_phy.c +++ b/sys/dev/sfxge/common/efx_phy.c @@ -47,7 +47,7 @@ static const efx_phy_ops_t __efx_phy_siena_ops = { #endif /* EFSYS_OPT_PHY_STATS */ #if EFSYS_OPT_BIST NULL, /* epo_bist_enable_offline */ - siena_phy_bist_start, /* epo_bist_start */ + siena_phy_bist_start, /* epo_bist_start */ siena_phy_bist_poll, /* epo_bist_poll */ siena_phy_bist_stop, /* epo_bist_stop */ #endif /* EFSYS_OPT_BIST */ @@ -65,11 +65,10 @@ static const efx_phy_ops_t __efx_phy_ef10_ops = { ef10_phy_stats_update, /* epo_stats_update */ #endif /* EFSYS_OPT_PHY_STATS */ #if EFSYS_OPT_BIST - /* FIXME: Are these BIST methods appropriate for Medford? */ - hunt_bist_enable_offline, /* epo_bist_enable_offline */ - hunt_bist_start, /* epo_bist_start */ - hunt_bist_poll, /* epo_bist_poll */ - hunt_bist_stop, /* epo_bist_stop */ + ef10_bist_enable_offline, /* epo_bist_enable_offline */ + ef10_bist_start, /* epo_bist_start */ + ef10_bist_poll, /* epo_bist_poll */ + ef10_bist_stop, /* epo_bist_stop */ #endif /* EFSYS_OPT_BIST */ }; #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ @@ -336,8 +335,8 @@ fail1: #if EFSYS_OPT_NAMES -/* START MKCONFIG GENERATED PhyStatNamesBlock d5f79b4bc2c050fe */ -static const char *__efx_phy_stat_name[] = { +/* START MKCONFIG GENERATED PhyStatNamesBlock af9ffa24da3bc100 */ +static const char * const __efx_phy_stat_name[] = { "oui", "pma_pmd_link_up", "pma_pmd_rx_fault", |
