examples: numa updates

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

diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 017fe0e..13e7271 100644 (file)
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -102,8 +102,6 @@
 #define MAX_PKT_BURST 32
 #define BURST_TX_DRAIN 200000ULL /* around 100us at 2 Ghz */
 
-#define SOCKET0 0
-
 /*
  * Configurable number of RX/TX ring descriptors
  */
@@ -148,7 +146,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
-               .mq_mode = ETH_DCB_NONE,
+               .mq_mode = ETH_MQ_TX_NONE,
        },
 };
 
@@ -609,7 +607,7 @@ MAIN(int argc, char **argv)
                                   sizeof(struct rte_pktmbuf_pool_private),
                                   rte_pktmbuf_pool_init, NULL,
                                   rte_pktmbuf_init, NULL,
-                                  SOCKET0, 0);
+                                  rte_socket_id(), 0);
        if (l2fwd_pktmbuf_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
 
@@ -709,10 +707,10 @@ MAIN(int argc, char **argv)
                        rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup:err=%d, port=%u\n",
                                  ret, (unsigned) portid);
 
-               /* init one TX queue logical core on each port */
+               /* init one TX queue on each port */
                fflush(stdout);
                ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
-                               SOCKET0, &tx_conf);
+                               rte_eth_dev_socket_id(portid), &tx_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
                                ret, (unsigned) portid);