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/bnxt: fix null dereference in session cleanup
[dpdk.git]
/
app
/
test-pipeline
/
init.c
diff --git
a/app/test-pipeline/init.c
b/app/test-pipeline/init.c
index
67d54ae
..
eee0719
100644
(file)
--- a/
app/test-pipeline/init.c
+++ b/
app/test-pipeline/init.c
@@
-21,7
+21,6
@@
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
-#include <rte_atomic.h>
#include <rte_cycles.h>
#include <rte_prefetch.h>
#include <rte_lcore.h>
#include <rte_cycles.h>
#include <rte_prefetch.h>
#include <rte_lcore.h>
@@
-70,16
+69,16
@@
struct app_params app = {
static struct rte_eth_conf port_conf = {
.rxmode = {
.split_hdr_size = 0,
static struct rte_eth_conf port_conf = {
.rxmode = {
.split_hdr_size = 0,
- .offloads =
DEV
_RX_OFFLOAD_CHECKSUM,
+ .offloads =
RTE_ETH
_RX_OFFLOAD_CHECKSUM,
},
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
},
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
- .rss_hf = ETH_RSS_IP,
+ .rss_hf =
RTE_
ETH_RSS_IP,
},
},
.txmode = {
},
},
.txmode = {
- .mq_mode = ETH_MQ_TX_NONE,
+ .mq_mode =
RTE_
ETH_MQ_TX_NONE,
},
};
},
};
@@
-155,7
+154,7
@@
static void
app_ports_check_link(void)
{
uint32_t all_ports_up, i;
app_ports_check_link(void)
{
uint32_t all_ports_up, i;
-
+ char link_status_text[RTE_ETH_LINK_MAX_STR_LEN];
all_ports_up = 1;
for (i = 0; i < app.n_ports; i++) {
all_ports_up = 1;
for (i = 0; i < app.n_ports; i++) {
@@
-173,13
+172,12
@@
app_ports_check_link(void)
all_ports_up = 0;
continue;
}
all_ports_up = 0;
continue;
}
-
- RTE_LOG(INFO, USER1, "Port %u (%u Gbps) %s\n",
+ rte_eth_link_to_str(link_status_text, sizeof(link_status_text),
+ &link);
+ RTE_LOG(INFO, USER1, "Port %u %s\n",
port,
port,
- link.link_speed / 1000,
- link.link_status ? "UP" : "DOWN");
-
- if (link.link_status == ETH_LINK_DOWN)
+ link_status_text);
+ if (link.link_status == RTE_ETH_LINK_DOWN)
all_ports_up = 0;
}
all_ports_up = 0;
}