From 1aa1b495edb9fec28d3b7fff83591a96c9adb5f8 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 23 Nov 2018 11:38:50 +0000 Subject: [PATCH] sfxge(4): improve RxQ label init prototype RxQ type provides more information which may be useful to setup event queue appropriately. Sponsored by: Solarflare Communications, Inc. Differential Revision: https://reviews.freebsd.org/D18098 --- sys/dev/sfxge/common/ef10_ev.c | 4 +++- sys/dev/sfxge/common/ef10_impl.h | 2 +- sys/dev/sfxge/common/ef10_rx.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/sfxge/common/ef10_ev.c b/sys/dev/sfxge/common/ef10_ev.c index 733719897e64..1815bb8b2d33 100644 --- a/sys/dev/sfxge/common/ef10_ev.c +++ b/sys/dev/sfxge/common/ef10_ev.c @@ -1344,9 +1344,11 @@ ef10_ev_rxlabel_init( __in efx_evq_t *eep, __in efx_rxq_t *erp, __in unsigned int label, - __in boolean_t packed_stream) + __in efx_rxq_type_t type) { efx_evq_rxq_state_t *eersp; + boolean_t packed_stream = (type >= EFX_RXQ_TYPE_PACKED_STREAM_1M) && + (type <= EFX_RXQ_TYPE_PACKED_STREAM_64K); EFSYS_ASSERT3U(label, <, EFX_ARRAY_SIZE(eep->ee_rxq_state)); eersp = &eep->ee_rxq_state[label]; diff --git a/sys/dev/sfxge/common/ef10_impl.h b/sys/dev/sfxge/common/ef10_impl.h index afd7aa82b4c1..f5ab5799cfbf 100644 --- a/sys/dev/sfxge/common/ef10_impl.h +++ b/sys/dev/sfxge/common/ef10_impl.h @@ -119,7 +119,7 @@ ef10_ev_rxlabel_init( __in efx_evq_t *eep, __in efx_rxq_t *erp, __in unsigned int label, - __in boolean_t packed_stream); + __in efx_rxq_type_t type); void ef10_ev_rxlabel_fini( diff --git a/sys/dev/sfxge/common/ef10_rx.c b/sys/dev/sfxge/common/ef10_rx.c index 0befdad996d7..22a30996e104 100644 --- a/sys/dev/sfxge/common/ef10_rx.c +++ b/sys/dev/sfxge/common/ef10_rx.c @@ -995,7 +995,7 @@ ef10_rx_qcreate( erp->er_eep = eep; erp->er_label = label; - ef10_ev_rxlabel_init(eep, erp, label, ps_buf_size != 0); + ef10_ev_rxlabel_init(eep, erp, label, type); return (0);