net/mlx5: add C++ include guard to public header

[dpdk.git] / drivers / net / mlx5 / mlx5_rxq.c

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index eda609d..580d7ae 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -140,6 +140,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
                              RTE_BIT32(rxq_ctrl->rxq.elts_n) *
                              RTE_BIT32(rxq_ctrl->rxq.log_strd_num) :
                              RTE_BIT32(rxq_ctrl->rxq.elts_n);
+       bool has_vec_support = mlx5_rxq_check_vec_support(&rxq_ctrl->rxq) > 0;
        unsigned int i;
        int err;
 
@@ -161,8 +162,9 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
                        rte_errno = ENOMEM;
                        goto error;
                }
-               /* Headroom is reserved by rte_pktmbuf_alloc(). */
-               MLX5_ASSERT(DATA_OFF(buf) == RTE_PKTMBUF_HEADROOM);
+               /* Only vectored Rx routines rely on headroom size. */
+               MLX5_ASSERT(!has_vec_support ||
+                           DATA_OFF(buf) >= RTE_PKTMBUF_HEADROOM);
                /* Buffer is supposed to be empty. */
                MLX5_ASSERT(rte_pktmbuf_data_len(buf) == 0);
                MLX5_ASSERT(rte_pktmbuf_pkt_len(buf) == 0);
@@ -175,7 +177,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)
                (*rxq_ctrl->rxq.elts)[i] = buf;
        }
        /* If Rx vector is activated. */
-       if (mlx5_rxq_check_vec_support(&rxq_ctrl->rxq) > 0) {
+       if (has_vec_support) {
                struct mlx5_rxq_data *rxq = &rxq_ctrl->rxq;
                struct rte_mbuf *mbuf_init = &rxq->fake_mbuf;
                struct rte_pktmbuf_pool_private *priv =
@@ -1617,7 +1619,7 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                        RTE_BIT32(log_def_stride_size));
                log_stride_wqe_size = log_def_stride_num + log_def_stride_size;
        }
-       MLX5_ASSERT(log_stride_wqe_size < config->mprq.log_min_stride_wqe_size);
+       MLX5_ASSERT(log_stride_wqe_size >= config->mprq.log_min_stride_wqe_size);
        if (desc <= RTE_BIT32(*actual_log_stride_num))
                goto unsupport;
        if (min_mbuf_size > RTE_BIT32(log_stride_wqe_size)) {