X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fl2fwd-cat%2Fl2fwd-cat.c;h=9b3e324efb230d656bab14de7007dc25ec92fc33;hb=1a86f4dbdf42792c639ecd5124b4c5f96232769f;hp=2e632c5cb6a517991dda334b0f958c3f05f19189;hpb=cb056611a8ed9ab9024f3b91bf26e97255194514;p=dpdk.git diff --git a/examples/l2fwd-cat/l2fwd-cat.c b/examples/l2fwd-cat/l2fwd-cat.c index 2e632c5cb6..9b3e324efb 100644 --- a/examples/l2fwd-cat/l2fwd-cat.c +++ b/examples/l2fwd-cat/l2fwd-cat.c @@ -80,10 +80,7 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool) printf("Port %u MAC: %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8 "\n", - port, - addr.addr_bytes[0], addr.addr_bytes[1], - addr.addr_bytes[2], addr.addr_bytes[3], - addr.addr_bytes[4], addr.addr_bytes[5]); + port, RTE_ETHER_ADDR_BYTES(&addr)); /* Enable RX in promiscuous mode for the Ethernet device. */ retval = rte_eth_promiscuous_enable(port); @@ -107,7 +104,7 @@ lcore_main(void) * for best performance. */ RTE_ETH_FOREACH_DEV(port) - if (rte_eth_dev_socket_id(port) > 0 && + if (rte_eth_dev_socket_id(port) >= 0 && rte_eth_dev_socket_id(port) != (int)rte_socket_id()) printf("WARNING, port %u is on remote NUMA node to " @@ -158,10 +155,11 @@ main(int argc, char *argv[]) unsigned nb_ports; uint16_t portid; - /* Initialize the Environment Abstraction Layer (EAL). */ + /* Initialize the Environment Abstraction Layer (EAL). 8< */ int ret = rte_eal_init(argc, argv); if (ret < 0) rte_exit(EXIT_FAILURE, "Error with EAL initialization\n"); + /* >8 End of initializion the Environment Abstraction Layer (EAL). */ argc -= ret; argv += ret; @@ -170,9 +168,12 @@ main(int argc, char *argv[]) * Initialize the PQoS library and configure CAT. * Please see l2fwd-cat documentation for more info. */ + + /* Initialize the PQoS. 8< */ ret = cat_init(argc, argv); if (ret < 0) rte_exit(EXIT_FAILURE, "PQOS: L3CA init failed!\n"); + /* >8 End of initialization of PQoS. */ argc -= ret; argv += ret; @@ -201,5 +202,8 @@ main(int argc, char *argv[]) /* Call lcore_main on the main core only. */ lcore_main(); + /* clean up the EAL */ + rte_eal_cleanup(); + return 0; }