From 1778ef67e2e77ff056565413d6c6f215f90e9cc2 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 2 May 2018 11:16:26 +0800 Subject: [PATCH] net/fm10k: remove dependence on Tx queue flags Since we move to new offload APIs, txq_flags is no long needed. This patch remove the dependence on that. Fixes: 30f3ce999e6a ("net/fm10k: convert to new Tx offloads API") Signed-off-by: Qi Zhang Acked-by: Konstantin Ananyev --- drivers/net/fm10k/fm10k.h | 1 - drivers/net/fm10k/fm10k_ethdev.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h index ce0f2c8f4c..ef30780910 100644 --- a/drivers/net/fm10k/fm10k.h +++ b/drivers/net/fm10k/fm10k.h @@ -212,7 +212,6 @@ struct fm10k_tx_queue { uint16_t next_rs; /* Next pos to set RS flag */ uint16_t next_dd; /* Next pos to check DD flag */ volatile uint32_t *tail_ptr; - uint32_t txq_flags; /* Holds flags for this TXq */ uint64_t offloads; /* Offloads of DEV_TX_OFFLOAD_* */ uint16_t nb_desc; uint16_t port_id; diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 7dfeddfe04..612490bef7 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -1442,7 +1442,6 @@ fm10k_dev_infos_get(struct rte_eth_dev *dev, }, .tx_free_thresh = FM10K_TX_FREE_THRESH_DEFAULT(0), .tx_rs_thresh = FM10K_TX_RS_THRESH_DEFAULT(0), - .txq_flags = FM10K_SIMPLE_TX_FLAG, .offloads = 0, }; @@ -2114,7 +2113,6 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, q->nb_desc = nb_desc; q->port_id = dev->data->port_id; q->queue_id = queue_id; - q->txq_flags = conf->txq_flags; q->offloads = conf->offloads; q->ops = &def_txq_ops; q->tail_ptr = (volatile uint32_t *) @@ -2981,7 +2979,7 @@ fm10k_set_tx_function(struct rte_eth_dev *dev) uint16_t tx_ftag_en = 0; if (rte_eal_process_type() != RTE_PROC_PRIMARY) { - /* primary process has set the ftag flag and txq_flags */ + /* primary process has set the ftag flag and offloads */ txq = dev->data->tx_queues[0]; if (fm10k_tx_vec_condition_check(txq)) { dev->tx_pkt_burst = fm10k_xmit_pkts; -- 2.20.1