git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ethdev: remove deprecated shared counter attribute
[dpdk.git]
/
drivers
/
net
/
bnxt
/
bnxt_txq.c
diff --git
a/drivers/net/bnxt/bnxt_txq.c
b/drivers/net/bnxt/bnxt_txq.c
index
830416a
..
72a55ea
100644
(file)
--- a/
drivers/net/bnxt/bnxt_txq.c
+++ b/
drivers/net/bnxt/bnxt_txq.c
@@
-53,9
+53,9
@@
void bnxt_free_tx_mbufs(struct bnxt *bp)
}
}
}
}
-void bnxt_tx_queue_release_op(
void *tx_queue
)
+void bnxt_tx_queue_release_op(
struct rte_eth_dev *dev, uint16_t queue_idx
)
{
{
- struct bnxt_tx_queue *txq =
(struct bnxt_tx_queue *)tx_queue
;
+ struct bnxt_tx_queue *txq =
dev->data->tx_queues[queue_idx]
;
if (txq) {
if (is_bnxt_in_error(txq->bp))
if (txq) {
if (is_bnxt_in_error(txq->bp))
@@
-83,6
+83,7
@@
void bnxt_tx_queue_release_op(void *tx_queue)
rte_free(txq->free);
rte_free(txq);
rte_free(txq->free);
rte_free(txq);
+ dev->data->tx_queues[queue_idx] = NULL;
}
}
}
}
@@
-114,10
+115,8
@@
int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
if (eth_dev->data->tx_queues) {
txq = eth_dev->data->tx_queues[queue_idx];
if (eth_dev->data->tx_queues) {
txq = eth_dev->data->tx_queues[queue_idx];
- if (txq) {
- bnxt_tx_queue_release_op(txq);
- txq = NULL;
- }
+ if (txq)
+ bnxt_tx_queue_release_op(eth_dev, queue_idx);
}
txq = rte_zmalloc_socket("bnxt_tx_queue", sizeof(struct bnxt_tx_queue),
RTE_CACHE_LINE_SIZE, socket_id);
}
txq = rte_zmalloc_socket("bnxt_tx_queue", sizeof(struct bnxt_tx_queue),
RTE_CACHE_LINE_SIZE, socket_id);
@@
-126,6
+125,9
@@
int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
return -ENOMEM;
}
return -ENOMEM;
}
+ txq->bp = bp;
+ eth_dev->data->tx_queues[queue_idx] = txq;
+
txq->free = rte_zmalloc_socket(NULL,
sizeof(struct rte_mbuf *) * nb_desc,
RTE_CACHE_LINE_SIZE, socket_id);
txq->free = rte_zmalloc_socket(NULL,
sizeof(struct rte_mbuf *) * nb_desc,
RTE_CACHE_LINE_SIZE, socket_id);
@@
-134,7
+136,6
@@
int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
rc = -ENOMEM;
goto err;
}
rc = -ENOMEM;
goto err;
}
- txq->bp = bp;
txq->nb_tx_desc = nb_desc;
txq->tx_free_thresh =
RTE_MIN(rte_align32pow2(nb_desc) / 4, RTE_BNXT_MAX_TX_BURST);
txq->nb_tx_desc = nb_desc;
txq->tx_free_thresh =
RTE_MIN(rte_align32pow2(nb_desc) / 4, RTE_BNXT_MAX_TX_BURST);
@@
-164,15
+165,8
@@
int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
goto err;
}
goto err;
}
- eth_dev->data->tx_queues[queue_idx] = txq;
-
- if (txq->tx_deferred_start)
- txq->tx_started = false;
- else
- txq->tx_started = true;
-
return 0;
err:
return 0;
err:
- bnxt_tx_queue_release_op(
txq
);
+ bnxt_tx_queue_release_op(
eth_dev, queue_idx
);
return rc;
}
return rc;
}