gpudev: add communication list

[dpdk.git] / examples / ethtool / ethtool-app / main.c

diff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c
index 2989101..cdd9e9b 100644 (file)
--- a/examples/ethtool/ethtool-app/main.c
+++ b/examples/ethtool/ethtool-app/main.c
@@ -98,7 +98,7 @@ static void setup_ports(struct app_config *app_cfg, int cnt_ports)
        int ret;
 
        memset(&cfg_port, 0, sizeof(cfg_port));
-       cfg_port.txmode.mq_mode = ETH_MQ_TX_NONE;
+       cfg_port.txmode.mq_mode = RTE_ETH_MQ_TX_NONE;
 
        for (idx_port = 0; idx_port < cnt_ports; idx_port++) {
                struct app_port *ptr_port = &app_cfg->ports[idx_port];
@@ -172,11 +172,11 @@ static void process_frame(struct app_port *ptr_port,
        struct rte_ether_hdr *ptr_mac_hdr;
 
        ptr_mac_hdr = rte_pktmbuf_mtod(ptr_frame, struct rte_ether_hdr *);
-       rte_ether_addr_copy(&ptr_mac_hdr->s_addr, &ptr_mac_hdr->d_addr);
-       rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr);
+       rte_ether_addr_copy(&ptr_mac_hdr->src_addr, &ptr_mac_hdr->dst_addr);
+       rte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->src_addr);
 }
 
-static int slave_main(__attribute__((unused)) void *ptr_data)
+static int worker_main(__rte_unused void *ptr_data)
 {
        struct app_port *ptr_port;
        struct rte_mbuf *ptr_frame;
@@ -284,19 +284,23 @@ int main(int argc, char **argv)
        app_cfg.cnt_ports = cnt_ports;
 
        if (rte_lcore_count() < 2)
-               rte_exit(EXIT_FAILURE, "No available slave core!\n");
-       /* Assume there is an available slave.. */
+               rte_exit(EXIT_FAILURE, "No available worker core!\n");
+
+       /* Assume there is an available worker.. */
        id_core = rte_lcore_id();
        id_core = rte_get_next_lcore(id_core, 1, 1);
-       rte_eal_remote_launch(slave_main, NULL, id_core);
+       rte_eal_remote_launch(worker_main, NULL, id_core);
 
        ethapp_main();
 
        app_cfg.exit_now = 1;
-       RTE_LCORE_FOREACH_SLAVE(id_core) {
+       RTE_LCORE_FOREACH_WORKER(id_core) {
                if (rte_eal_wait_lcore(id_core) < 0)
                        return -1;
        }
 
+       /* clean up the EAL */
+       rte_eal_cleanup();
+
        return 0;
 }