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
net/ice: fix build when Rx descriptor size is 16
[dpdk.git]
/
drivers
/
net
/
cxgbe
/
cxgbe_ethdev.c
diff --git
a/drivers/net/cxgbe/cxgbe_ethdev.c
b/drivers/net/cxgbe/cxgbe_ethdev.c
index
304fafe
..
cd9aa9f
100644
(file)
--- a/
drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/
drivers/net/cxgbe/cxgbe_ethdev.c
@@
-532,7
+532,7
@@
int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
/* Free up the existing queue */
if (eth_dev->data->tx_queues[queue_idx]) {
/* Free up the existing queue */
if (eth_dev->data->tx_queues[queue_idx]) {
- cxgbe_dev_tx_queue_release(eth_dev
->data->tx_queues[queue_idx]
);
+ cxgbe_dev_tx_queue_release(eth_dev
, queue_idx
);
eth_dev->data->tx_queues[queue_idx] = NULL;
}
eth_dev->data->tx_queues[queue_idx] = NULL;
}
@@
-565,9
+565,9
@@
int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
return err;
}
return err;
}
-void cxgbe_dev_tx_queue_release(
void *q
)
+void cxgbe_dev_tx_queue_release(
struct rte_eth_dev *eth_dev, uint16_t qid
)
{
{
- struct sge_eth_txq *txq =
(struct sge_eth_txq *)q
;
+ struct sge_eth_txq *txq =
eth_dev->data->tx_queues[qid]
;
if (txq) {
struct port_info *pi = (struct port_info *)
if (txq) {
struct port_info *pi = (struct port_info *)
@@
-655,7
+655,7
@@
int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
/* Free up the existing queue */
if (eth_dev->data->rx_queues[queue_idx]) {
/* Free up the existing queue */
if (eth_dev->data->rx_queues[queue_idx]) {
- cxgbe_dev_rx_queue_release(eth_dev
->data->rx_queues[queue_idx]
);
+ cxgbe_dev_rx_queue_release(eth_dev
, queue_idx
);
eth_dev->data->rx_queues[queue_idx] = NULL;
}
eth_dev->data->rx_queues[queue_idx] = NULL;
}
@@
-679,8
+679,7
@@
int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
}
rxq->rspq.size = temp_nb_desc;
}
rxq->rspq.size = temp_nb_desc;
- if ((&rxq->fl) != NULL)
- rxq->fl.size = temp_nb_desc;
+ rxq->fl.size = temp_nb_desc;
/* Set to jumbo mode if necessary */
if (pkt_len > CXGBE_ETH_MAX_LEN)
/* Set to jumbo mode if necessary */
if (pkt_len > CXGBE_ETH_MAX_LEN)
@@
-702,9
+701,9
@@
int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
return err;
}
return err;
}
-void cxgbe_dev_rx_queue_release(
void *q
)
+void cxgbe_dev_rx_queue_release(
struct rte_eth_dev *eth_dev, uint16_t qid
)
{
{
- struct sge_eth_rxq *rxq =
(struct sge_eth_rxq *)q
;
+ struct sge_eth_rxq *rxq =
eth_dev->data->rx_queues[qid]
;
if (rxq) {
struct port_info *pi = (struct port_info *)
if (rxq) {
struct port_info *pi = (struct port_info *)
@@
-1036,8
+1035,9
@@
out_err:
/* Get names of port extended statistics by ID. */
int cxgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
/* Get names of port extended statistics by ID. */
int cxgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
- struct rte_eth_xstat_name *xnames,
- const uint64_t *ids, unsigned int n)
+ const uint64_t *ids,
+ struct rte_eth_xstat_name *xnames,
+ unsigned int n)
{
struct port_info *pi = dev->data->dev_private;
struct rte_eth_xstat_name *xnames_copy;
{
struct port_info *pi = dev->data->dev_private;
struct rte_eth_xstat_name *xnames_copy;