net/ice: fix build when Rx descriptor size is 16

[dpdk.git] / drivers / vdpa / mlx5 / mlx5_vdpa.h

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h
index 98c71aa..a27f3fd 100644 (file)
--- a/drivers/vdpa/mlx5/mlx5_vdpa.h
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h
@@ -54,10 +54,7 @@ struct mlx5_vdpa_cq {
 struct mlx5_vdpa_event_qp {
        struct mlx5_vdpa_cq cq;
        struct mlx5_devx_obj *fw_qp;
-       struct mlx5_devx_obj *sw_qp;
-       struct mlx5dv_devx_umem *umem_obj;
-       void *umem_buf;
-       volatile uint32_t *db_rec;
+       struct mlx5_devx_qp sw_qp;
 };
 
 struct mlx5_vdpa_query_mr {
@@ -120,23 +117,19 @@ struct mlx5_vdpa_priv {
        TAILQ_ENTRY(mlx5_vdpa_priv) next;
        uint8_t configured;
        pthread_mutex_t vq_config_lock;
-       uint64_t last_traffic_tic;
+       uint64_t no_traffic_counter;
        pthread_t timer_tid;
-       pthread_mutex_t timer_lock;
-       pthread_cond_t timer_cond;
-       volatile uint8_t timer_on;
        int event_mode;
        int event_core; /* Event thread cpu affinity core. */
        uint32_t event_us;
        uint32_t timer_delay_us;
-       uint32_t no_traffic_time_s;
+       uint32_t no_traffic_max;
        uint8_t hw_latency_mode; /* Hardware CQ moderation mode. */
        uint16_t hw_max_latency_us; /* Hardware CQ moderation period in usec. */
        uint16_t hw_max_pending_comp; /* Hardware CQ moderation counter. */
        struct rte_vdpa_device *vdev; /* vDPA device. */
        int vid; /* vhost device id. */
        struct ibv_context *ctx; /* Device context. */
-       struct rte_pci_device *pci_dev;
        struct mlx5_hca_vdpa_attr caps;
        uint32_t pdn; /* Protection Domain number. */
        struct ibv_pd *pd;
@@ -146,12 +139,12 @@ struct mlx5_vdpa_priv {
        struct mlx5dv_devx_event_channel *eventc;
        struct mlx5dv_devx_event_channel *err_chnl;
        struct mlx5dv_devx_uar *uar;
-       struct rte_intr_handle intr_handle;
        struct rte_intr_handle err_intr_handle;
        struct mlx5_devx_obj *td;
        struct mlx5_devx_obj *tiss[16]; /* TIS list for each LAG port. */
        uint16_t nr_virtqs;
        uint8_t num_lag_ports;
+       uint8_t qp_ts_format;
        uint64_t features; /* Negotiated features. */
        uint16_t log_max_rqt_size;
        struct mlx5_vdpa_steer steer;