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/base: remove unused DDP package macros
[dpdk.git]
/
examples
/
exception_path
/
main.c
diff --git
a/examples/exception_path/main.c
b/examples/exception_path/main.c
index
4180a86
..
85dbd7e
100644
(file)
--- a/
examples/exception_path/main.c
+++ b/
examples/exception_path/main.c
@@
-14,7
+14,7
@@
#include <netinet/in.h>
#include <net/if.h>
#include <netinet/in.h>
#include <net/if.h>
-#ifdef RTE_EXEC_ENV_LINUX
APP
+#ifdef RTE_EXEC_ENV_LINUX
#include <linux/if_tun.h>
#endif
#include <fcntl.h>
#include <linux/if_tun.h>
#endif
#include <fcntl.h>
@@
-156,7
+156,7
@@
signal_handler(int signum)
}
}
}
}
-#ifdef RTE_EXEC_ENV_LINUX
APP
+#ifdef RTE_EXEC_ENV_LINUX
/*
* Create a tap network interface, or use existing one with same name.
* If name[0]='\0' then a name is automatically assigned and returned in name.
/*
* Create a tap network interface, or use existing one with same name.
* If name[0]='\0' then a name is automatically assigned and returned in name.
@@
-176,7
+176,7
@@
static int tap_create(char *name)
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
if (name && *name)
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
if (name && *name)
- s
nprintf(ifr.ifr_name, IFNAMSIZ, "%s", name
);
+ s
trlcpy(ifr.ifr_name, name, IFNAMSIZ
);
ret = ioctl(fd, TUNSETIFF, (void *) &ifr);
if (ret < 0) {
ret = ioctl(fd, TUNSETIFF, (void *) &ifr);
if (ret < 0) {
@@
-185,7
+185,7
@@
static int tap_create(char *name)
}
if (name)
}
if (name)
- s
nprintf(name, IFNAMSIZ, "%s", ifr.ifr_name
);
+ s
trlcpy(name, ifr.ifr_name, IFNAMSIZ
);
return fd;
}
return fd;
}
@@
-432,7
+432,12
@@
init_port(uint16_t port)
/* Initialise device and RX/TX queues */
PRINT_INFO("Initialising port %u ...", port);
fflush(stdout);
/* Initialise device and RX/TX queues */
PRINT_INFO("Initialising port %u ...", port);
fflush(stdout);
- rte_eth_dev_info_get(port, &dev_info);
+
+ ret = rte_eth_dev_info_get(port, &dev_info);
+ if (ret != 0)
+ FATAL_ERROR("Error during getting device (port %u) info: %s\n",
+ port, strerror(-ret));
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@
-468,7
+473,10
@@
init_port(uint16_t port)
if (ret < 0)
FATAL_ERROR("Could not start port%u (%d)", port, ret);
if (ret < 0)
FATAL_ERROR("Could not start port%u (%d)", port, ret);
- rte_eth_promiscuous_enable(port);
+ ret = rte_eth_promiscuous_enable(port);
+ if (ret != 0)
+ FATAL_ERROR("Could not enable promiscuous mode for port%u (%s)",
+ port, rte_strerror(-ret));
}
/* Check the link status of all ports in up to 9s, and print them finally */
}
/* Check the link status of all ports in up to 9s, and print them finally */
@@
-480,6
+488,7
@@
check_all_ports_link_status(uint32_t port_mask)
uint16_t portid;
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
uint16_t portid;
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
+ int ret;
printf("\nChecking link status");
fflush(stdout);
printf("\nChecking link status");
fflush(stdout);
@@
-489,7
+498,14
@@
check_all_ports_link_status(uint32_t port_mask)
if ((port_mask & (1 << portid)) == 0)
continue;
memset(&link, 0, sizeof(link));
if ((port_mask & (1 << portid)) == 0)
continue;
memset(&link, 0, sizeof(link));
- rte_eth_link_get_nowait(portid, &link);
+ ret = rte_eth_link_get_nowait(portid, &link);
+ if (ret < 0) {
+ all_ports_up = 0;
+ if (print_flag == 1)
+ printf("Port %u link get failed: %s\n",
+ portid, rte_strerror(-ret));
+ continue;
+ }
/* print link status if flag set */
if (print_flag == 1) {
if (link.link_status)
/* print link status if flag set */
if (print_flag == 1) {
if (link.link_status)