mbuf: add rte prefix to offload flags

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

diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index ce87b2e..8042278 100644 (file)
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -79,13 +79,13 @@ static struct rte_eth_conf port_conf = {
  * Packet RX/TX
  *
  ***/
-#define PKT_RX_BURST_MAX                32
-#define PKT_TX_BURST_MAX                32
+#define RTE_MBUF_F_RX_BURST_MAX                32
+#define RTE_MBUF_F_TX_BURST_MAX                32
 #define TIME_TX_DRAIN                   200000ULL
 
 static uint16_t port_rx;
 static uint16_t port_tx;
-static struct rte_mbuf *pkts_rx[PKT_RX_BURST_MAX];
+static struct rte_mbuf *pkts_rx[RTE_MBUF_F_RX_BURST_MAX];
 struct rte_eth_dev_tx_buffer *tx_buffer;
 
 struct rte_meter_srtcm_params app_srtcm_params = {
@@ -188,7 +188,7 @@ main_loop(__rte_unused void *dummy)
                }
 
                /* Read packet burst from NIC RX */
-               nb_rx = rte_eth_rx_burst(port_rx, NIC_RX_QUEUE, pkts_rx, PKT_RX_BURST_MAX);
+               nb_rx = rte_eth_rx_burst(port_rx, NIC_RX_QUEUE, pkts_rx, RTE_MBUF_F_RX_BURST_MAX);
 
                /* Handle packets */
                for (i = 0; i < nb_rx; i ++) {
@@ -420,13 +420,13 @@ main(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_tx, ret);
 
        tx_buffer = rte_zmalloc_socket("tx_buffer",
-                       RTE_ETH_TX_BUFFER_SIZE(PKT_TX_BURST_MAX), 0,
+                       RTE_ETH_TX_BUFFER_SIZE(RTE_MBUF_F_TX_BURST_MAX), 0,
                        rte_eth_dev_socket_id(port_tx));
        if (tx_buffer == NULL)
                rte_exit(EXIT_FAILURE, "Port %d TX buffer allocation error\n",
                                port_tx);
 
-       rte_eth_tx_buffer_init(tx_buffer, PKT_TX_BURST_MAX);
+       rte_eth_tx_buffer_init(tx_buffer, RTE_MBUF_F_TX_BURST_MAX);
 
        ret = rte_eth_dev_start(port_rx);
        if (ret < 0)
@@ -454,11 +454,14 @@ main(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "Invalid configure flow table\n");
 
        /* Launch per-lcore init on every lcore */
-       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       rte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                if (rte_eal_wait_lcore(lcore_id) < 0)
                        return -1;
        }
 
+       /* clean up the EAL */
+       rte_eal_cleanup();
+
        return 0;
 }