32c32
< __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_tx.c 293891 2016-01-14 09:05:51Z arybchik $");
---
> __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_tx.c 299320 2016-05-10 07:01:06Z arybchik $");
47c47
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
124c124
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */
127,152d126
< #if EFSYS_OPT_FALCON
< static efx_tx_ops_t __efx_tx_falcon_ops = {
< falconsiena_tx_init, /* etxo_init */
< falconsiena_tx_fini, /* etxo_fini */
< falconsiena_tx_qcreate, /* etxo_qcreate */
< falconsiena_tx_qdestroy, /* etxo_qdestroy */
< falconsiena_tx_qpost, /* etxo_qpost */
< falconsiena_tx_qpush, /* etxo_qpush */
< falconsiena_tx_qpace, /* etxo_qpace */
< falconsiena_tx_qflush, /* etxo_qflush */
< falconsiena_tx_qenable, /* etxo_qenable */
< NULL, /* etxo_qpio_enable */
< NULL, /* etxo_qpio_disable */
< NULL, /* etxo_qpio_write */
< NULL, /* etxo_qpio_post */
< falconsiena_tx_qdesc_post, /* etxo_qdesc_post */
< falconsiena_tx_qdesc_dma_create, /* etxo_qdesc_dma_create */
< NULL, /* etxo_qdesc_tso_create */
< NULL, /* etxo_qdesc_tso2_create */
< NULL, /* etxo_qdesc_vlantci_create */
< #if EFSYS_OPT_QSTATS
< falconsiena_tx_qstats_update, /* etxo_qstats_update */
< #endif
< };
< #endif /* EFSYS_OPT_FALCON */
<
252,257d225
< #if EFSYS_OPT_FALCON
< case EFX_FAMILY_FALCON:
< etxop = (efx_tx_ops_t *)&__efx_tx_falcon_ops;
< break;
< #endif /* EFSYS_OPT_FALCON */
<
697c665
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
1058c1026
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */
1083c1051
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
1123c1091
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */