event/dlb2: add v2.5 create LDB queue

[dpdk.git] / examples / l2fwd-keepalive / main.c

diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 35d10e5..be66162 100644 (file)
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -450,6 +450,7 @@ check_all_ports_link_status(uint32_t port_mask)
        uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
        int ret;
+       char link_status_text[RTE_ETH_LINK_MAX_STR_LEN];
 
        printf("\nChecking link status");
        fflush(stdout);
@@ -469,14 +470,10 @@ check_all_ports_link_status(uint32_t port_mask)
                        }
                        /* print link status if flag set */
                        if (print_flag == 1) {
-                               if (link.link_status)
-                                       printf(
-                                       "Port%d Link Up. Speed %u Mbps - %s\n",
-                                               portid, link.link_speed,
-                               (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                                       ("full-duplex") : ("half-duplex"));
-                               else
-                                       printf("Port %d Link Down\n", portid);
+                               rte_eth_link_to_str(link_status_text,
+                                       sizeof(link_status_text), &link);
+                               printf("Port %d %s\n", portid,
+                                      link_status_text);
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
@@ -789,8 +786,8 @@ main(int argc, char **argv)
                                ) != 0 )
                        rte_exit(EXIT_FAILURE, "Stats setup failure.\n");
        }
-       /* launch per-lcore init on every slave lcore */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       /* launch per-lcore init on every worker lcore */
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                struct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];
 
                if (qconf->n_rx_port == 0)
@@ -813,12 +810,16 @@ main(int argc, char **argv)
                rte_delay_ms(5);
                }
 
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
 
        if (ka_shm != NULL)
                rte_keepalive_shm_cleanup(ka_shm);
+
+       /* clean up the EAL */
+       rte_eal_cleanup();
+
        return 0;
 }