lib: remove unneeded header includes

[dpdk.git] / lib / eventdev / rte_event_eth_tx_adapter.c

diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
index db260bf..1b304f0 100644 (file)
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -3,10 +3,10 @@
  */
 #include <rte_spinlock.h>
 #include <rte_service_component.h>
-#include <rte_ethdev.h>
+#include <ethdev_driver.h>
 
 #include "eventdev_pmd.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 #include "rte_event_eth_tx_adapter.h"
 
 #define TXA_BATCH_SIZE         32
@@ -286,7 +286,6 @@ txa_service_conf_cb(uint8_t __rte_unused id, uint8_t dev_id,
                return ret;
        }
 
-       pc->event_port_cfg = 0;
        ret = rte_event_port_setup(dev_id, port_id, pc);
        if (ret) {
                RTE_EDEV_LOG_ERR("failed to setup event port %u\n",
@@ -807,10 +806,8 @@ txa_service_queue_add(uint8_t id,
 
        rte_spinlock_lock(&txa->tx_lock);
 
-       if (txa_service_is_queue_added(txa, eth_dev, tx_queue_id)) {
-               rte_spinlock_unlock(&txa->tx_lock);
-               return 0;
-       }
+       if (txa_service_is_queue_added(txa, eth_dev, tx_queue_id))
+               goto ret_unlock;
 
        ret = txa_service_queue_array_alloc(txa, eth_dev->data->port_id);
        if (ret)
@@ -822,6 +819,8 @@ txa_service_queue_add(uint8_t id,
 
        tdi = &txa->txa_ethdev[eth_dev->data->port_id];
        tqi = txa_service_queue(txa, eth_dev->data->port_id, tx_queue_id);
+       if (tqi == NULL)
+               goto err_unlock;
 
        txa_retry = &tqi->txa_retry;
        txa_retry->id = txa->id;
@@ -837,6 +836,10 @@ txa_service_queue_add(uint8_t id,
        tdi->nb_queues++;
        txa->nb_queues++;
 
+ret_unlock:
+       rte_spinlock_unlock(&txa->tx_lock);
+       return 0;
+
 err_unlock:
        if (txa->nb_queues == 0) {
                txa_service_queue_array_free(txa,
@@ -845,7 +848,7 @@ err_unlock:
        }
 
        rte_spinlock_unlock(&txa->tx_lock);
-       return 0;
+       return -1;
 }
 
 static int
@@ -865,7 +868,7 @@ txa_service_queue_del(uint8_t id,
                uint16_t i, q, nb_queues;
                int ret = 0;
 
-               nb_queues = txa->nb_queues;
+               nb_queues = txa->txa_ethdev[port_id].nb_queues;
                if (nb_queues == 0)
                        return 0;