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

[dpdk.git] / drivers / event / opdl / opdl_test.c

diff --git a/drivers/event/opdl/opdl_test.c b/drivers/event/opdl/opdl_test.c
index 39c6cf8..e4fc70a 100644 (file)
--- a/drivers/event/opdl/opdl_test.c
+++ b/drivers/event/opdl/opdl_test.c
@@ -1,6 +1,5 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <stdio.h>
@@ -257,7 +256,7 @@ ordered_basic(struct test *t)
                ev.queue_id = t->qid[0];
                ev.op = RTE_EVENT_OP_NEW;
                ev.mbuf = mbufs[i];
-               mbufs[i]->seqn = MAGIC_SEQN + i;
+               *rte_event_pmd_selftest_seqn(mbufs[i]) = MAGIC_SEQN + i;
 
                /* generate pkt and enqueue */
                err = rte_event_enqueue_burst(evdev, t->port[rx_port], &ev, 1);
@@ -282,7 +281,7 @@ ordered_basic(struct test *t)
                        rte_event_dev_dump(evdev, stdout);
                        return -1;
                }
-               seq = deq_ev[i].mbuf->seqn  - MAGIC_SEQN;
+               seq = *rte_event_pmd_selftest_seqn(deq_ev[i].mbuf)  - MAGIC_SEQN;
 
                if (seq != (i-1)) {
                        PMD_DRV_LOG(ERR, " seq test failed ! eq is %d , "
@@ -397,7 +396,7 @@ atomic_basic(struct test *t)
                ev.op = RTE_EVENT_OP_NEW;
                ev.flow_id = 1;
                ev.mbuf = mbufs[i];
-               mbufs[i]->seqn = MAGIC_SEQN + i;
+               *rte_event_pmd_selftest_seqn(mbufs[i]) = MAGIC_SEQN + i;
 
                /* generate pkt and enqueue */
                err = rte_event_enqueue_burst(evdev, t->port[rx_port], &ev, 1);
@@ -626,7 +625,7 @@ single_link_w_stats(struct test *t)
                ev.queue_id = t->qid[0];
                ev.op = RTE_EVENT_OP_NEW;
                ev.mbuf = mbufs[i];
-               mbufs[i]->seqn = 1234 + i;
+               *rte_event_pmd_selftest_seqn(mbufs[i]) = 1234 + i;
 
                /* generate pkt and enqueue */
                err = rte_event_enqueue_burst(evdev, t->port[rx_port], &ev, 1);
@@ -696,9 +695,6 @@ single_link_w_stats(struct test *t)
 static int
 single_link(struct test *t)
 {
-       /* const uint8_t rx_port = 0; */
-       /* const uint8_t w1_port = 1; */
-       /* const uint8_t w3_port = 3; */
        const uint8_t tx_port = 2;
        int err;
        struct rte_mbuf *mbufs[3];
@@ -1001,11 +997,13 @@ opdl_selftest(void)
                /* turn on stats by default */
                if (rte_vdev_init(eventdev_name, "do_validation=1") < 0) {
                        PMD_DRV_LOG(ERR, "Error creating eventdev\n");
+                       free(t);
                        return -1;
                }
                evdev = rte_event_dev_get_dev_id(eventdev_name);
                if (evdev < 0) {
                        PMD_DRV_LOG(ERR, "Error finding newly created eventdev\n");
+                       free(t);
                        return -1;
                }
        }
@@ -1021,6 +1019,7 @@ opdl_selftest(void)
                                rte_socket_id());
                if (!eventdev_func_mempool) {
                        PMD_DRV_LOG(ERR, "ERROR creating mempool\n");
+                       free(t);
                        return -1;
                }
        }
@@ -1043,9 +1042,9 @@ opdl_selftest(void)
        ret = single_link_w_stats(t);
 
        /*
-        * Free test instance, leaving mempool initialized, and a pointer to it
-        * in static eventdev_func_mempool, as it is re-used on re-runs
+        * Free test instance, free  mempool
         */
+       rte_mempool_free(t->mbuf_pool);
        free(t);
 
        if (ret != 0)