32c32
< __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_rx.c 293890 2016-01-14 09:03:02Z arybchik $");
---
> __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_rx.c 299320 2016-05-10 07:01:06Z arybchik $");
38c38
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
128c128
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */
131,153d130
< #if EFSYS_OPT_FALCON
< static efx_rx_ops_t __efx_rx_falcon_ops = {
< falconsiena_rx_init, /* erxo_init */
< falconsiena_rx_fini, /* erxo_fini */
< #if EFSYS_OPT_RX_SCATTER
< falconsiena_rx_scatter_enable, /* erxo_scatter_enable */
< #endif
< #if EFSYS_OPT_RX_SCALE
< falconsiena_rx_scale_mode_set, /* erxo_scale_mode_set */
< falconsiena_rx_scale_key_set, /* erxo_scale_key_set */
< falconsiena_rx_scale_tbl_set, /* erxo_scale_tbl_set */
< falconsiena_rx_prefix_hash, /* erxo_prefix_hash */
< #endif
< falconsiena_rx_prefix_pktlen, /* erxo_prefix_pktlen */
< falconsiena_rx_qpost, /* erxo_qpost */
< falconsiena_rx_qpush, /* erxo_qpush */
< falconsiena_rx_qflush, /* erxo_qflush */
< falconsiena_rx_qenable, /* erxo_qenable */
< falconsiena_rx_qcreate, /* erxo_qcreate */
< falconsiena_rx_qdestroy, /* erxo_qdestroy */
< };
< #endif /* EFSYS_OPT_FALCON */
<
222,227d198
< #if EFSYS_OPT_FALCON
< case EFX_FAMILY_FALCON:
< erxop = (efx_rx_ops_t *)&__efx_rx_falcon_ops;
< break;
< #endif /* EFSYS_OPT_FALCON */
<
596c567
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
1258c1229
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */