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
mbuf: mark old VLAN offload flags as deprecated
[dpdk.git]
/
drivers
/
net
/
txgbe
/
txgbe_tm.c
diff --git
a/drivers/net/txgbe/txgbe_tm.c
b/drivers/net/txgbe/txgbe_tm.c
index
b8edd78
..
3171be7
100644
(file)
--- a/
drivers/net/txgbe/txgbe_tm.c
+++ b/
drivers/net/txgbe/txgbe_tm.c
@@
-1,5
+1,6
@@
/* SPDX-License-Identifier: BSD-3-Clause
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
*/
#include <rte_malloc.h>
*/
#include <rte_malloc.h>
@@
-117,14
+118,14
@@
txgbe_tc_nb_get(struct rte_eth_dev *dev)
uint8_t nb_tcs = 0;
eth_conf = &dev->data->dev_conf;
uint8_t nb_tcs = 0;
eth_conf = &dev->data->dev_conf;
- if (eth_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
+ if (eth_conf->txmode.mq_mode ==
RTE_
ETH_MQ_TX_DCB) {
nb_tcs = eth_conf->tx_adv_conf.dcb_tx_conf.nb_tcs;
nb_tcs = eth_conf->tx_adv_conf.dcb_tx_conf.nb_tcs;
- } else if (eth_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
+ } else if (eth_conf->txmode.mq_mode ==
RTE_
ETH_MQ_TX_VMDQ_DCB) {
if (eth_conf->tx_adv_conf.vmdq_dcb_tx_conf.nb_queue_pools ==
if (eth_conf->tx_adv_conf.vmdq_dcb_tx_conf.nb_queue_pools ==
- ETH_32_POOLS)
- nb_tcs = ETH_4_TCS;
+
RTE_
ETH_32_POOLS)
+ nb_tcs =
RTE_
ETH_4_TCS;
else
else
- nb_tcs = ETH_8_TCS;
+ nb_tcs =
RTE_
ETH_8_TCS;
} else {
nb_tcs = 1;
}
} else {
nb_tcs = 1;
}
@@
-363,10
+364,10
@@
txgbe_queue_base_nb_get(struct rte_eth_dev *dev, uint16_t tc_node_no,
if (vf_num) {
/* no DCB */
if (nb_tcs == 1) {
if (vf_num) {
/* no DCB */
if (nb_tcs == 1) {
- if (vf_num >= ETH_32_POOLS) {
+ if (vf_num >=
RTE_
ETH_32_POOLS) {
*nb = 2;
*base = vf_num * 2;
*nb = 2;
*base = vf_num * 2;
- } else if (vf_num >= ETH_16_POOLS) {
+ } else if (vf_num >=
RTE_
ETH_16_POOLS) {
*nb = 4;
*base = vf_num * 4;
} else {
*nb = 4;
*base = vf_num * 4;
} else {
@@
-380,7
+381,7
@@
txgbe_queue_base_nb_get(struct rte_eth_dev *dev, uint16_t tc_node_no,
}
} else {
/* VT off */
}
} else {
/* VT off */
- if (nb_tcs == ETH_8_TCS) {
+ if (nb_tcs ==
RTE_
ETH_8_TCS) {
switch (tc_node_no) {
case 0:
*base = 0;
switch (tc_node_no) {
case 0:
*base = 0;