32c32
< __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_mcdi.c 292051 2015-12-10 07:16:21Z arybchik $");
---
> __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_mcdi.c 292055 2015-12-10 07:42:56Z arybchik $");
53,58c53
< siena_mcdi_fw_update_supported, /* emco_fw_update_supported */
< siena_mcdi_macaddr_change_supported,
< /* emco_macaddr_change_supported */
< siena_mcdi_link_control_supported,
< /* emco_link_control_supported */
< NULL, /* emco_mac_spoofing_supported */
---
> siena_mcdi_feature_supported, /* emco_feature_supported */
73,79c68
< hunt_mcdi_fw_update_supported, /* emco_fw_update_supported */
< hunt_mcdi_macaddr_change_supported,
< /* emco_macaddr_change_supported */
< hunt_mcdi_link_control_supported,
< /* emco_link_control_supported */
< hunt_mcdi_mac_spoofing_supported,
< /* emco_mac_spoofing_supported */
---
> hunt_mcdi_feature_supported, /* emco_feature_supported */
1319d1307
<
1328,1330c1316,1318
< if (emcop != NULL && emcop->emco_fw_update_supported != NULL) {
< if ((rc = emcop->emco_fw_update_supported(enp, supportedp))
< != 0)
---
> if (emcop != NULL) {
> if ((rc = emcop->emco_feature_supported(enp,
> EFX_MCDI_FEATURE_FW_UPDATE, supportedp)) != 0)
1353,1355c1341,1343
< if (emcop != NULL && emcop->emco_macaddr_change_supported != NULL) {
< if ((rc = emcop->emco_macaddr_change_supported(enp, supportedp))
< != 0)
---
> if (emcop != NULL) {
> if ((rc = emcop->emco_feature_supported(enp,
> EFX_MCDI_FEATURE_MACADDR_CHANGE, supportedp)) != 0)
1378,1380c1366,1368
< if (emcop != NULL && emcop->emco_link_control_supported != NULL) {
< if ((rc = emcop->emco_link_control_supported(enp, supportedp))
< != 0)
---
> if (emcop != NULL) {
> if ((rc = emcop->emco_feature_supported(enp,
> EFX_MCDI_FEATURE_LINK_CONTROL, supportedp)) != 0)
1403,1405c1391,1393
< if (emcop != NULL && emcop->emco_mac_spoofing_supported != NULL) {
< if ((rc = emcop->emco_mac_spoofing_supported(enp, supportedp))
< != 0)
---
> if (emcop != NULL) {
> if ((rc = emcop->emco_feature_supported(enp,
> EFX_MCDI_FEATURE_MAC_SPOOFING, supportedp)) != 0)