lib: fix various compilation warnings

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

diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index d751197..017fe0e 100644 (file)
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -123,7 +123,6 @@ static uint32_t l2fwd_dst_ports[L2FWD_MAX_PORTS];
 
 static unsigned int l2fwd_rx_queue_per_lcore = 1;
 
-#define MAX_PKT_BURST 32
 struct mbuf_table {
        unsigned len;
        struct rte_mbuf *m_table[MAX_PKT_BURST];
@@ -586,8 +585,8 @@ MAIN(int argc, char **argv)
        struct lcore_queue_conf *qconf;
        struct rte_eth_dev_info dev_info;
        int ret;
-       unsigned int nb_ports;
-       unsigned portid, last_port;
+       uint8_t nb_ports;
+       uint8_t portid, last_port;
        unsigned lcore_id, rx_lcore_id;
        unsigned nb_ports_in_mask = 0;
 
@@ -650,7 +649,7 @@ MAIN(int argc, char **argv)
 
                nb_ports_in_mask++;
 
-               rte_eth_dev_info_get((uint8_t) portid, &dev_info);
+               rte_eth_dev_info_get(portid, &dev_info);
        }
        if (nb_ports_in_mask < 2 || nb_ports_in_mask % 2) {
                printf("Notice: odd number of ports in portmask.\n");
@@ -681,55 +680,55 @@ MAIN(int argc, char **argv)
 
                qconf->rx_port_list[qconf->n_rx_port] = portid;
                qconf->n_rx_port++;
-               printf("Lcore %u: RX port %u\n", rx_lcore_id, portid);
+               printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned) portid);
        }
 
        /* Initialise each port */
        for (portid = 0; portid < nb_ports; portid++) {
                /* skip ports that are not enabled */
                if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
-                       printf("Skipping disabled port %u\n", portid);
+                       printf("Skipping disabled port %u\n", (unsigned) portid);
                        continue;
                }
                /* init port */
-               printf("Initializing port %u... ", portid);
+               printf("Initializing port %u... ", (unsigned) portid);
                fflush(stdout);
-               ret = rte_eth_dev_configure((uint8_t) portid, 1, 1, &port_conf);
+               ret = rte_eth_dev_configure(portid, 1, 1, &port_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "Cannot configure device: err=%d, port=%u\n",
-                                 ret, portid);
+                                 ret, (unsigned) portid);
 
-               rte_eth_macaddr_get((uint8_t) portid,&l2fwd_ports_eth_addr[portid]);
+               rte_eth_macaddr_get(portid,&l2fwd_ports_eth_addr[portid]);
 
                /* init one RX queue */
                fflush(stdout);
-               ret = rte_eth_rx_queue_setup((uint8_t) portid, 0, nb_rxd,
-                                            SOCKET0, &rx_conf,
+               ret = rte_eth_rx_queue_setup(portid, 0, nb_rxd,
+                                            rte_eth_dev_socket_id(portid), &rx_conf,
                                             l2fwd_pktmbuf_pool);
                if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
-                                 ret, portid);
+                       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 */
                fflush(stdout);
-               ret = rte_eth_tx_queue_setup((uint8_t) portid, 0, nb_txd,
+               ret = rte_eth_tx_queue_setup(portid, 0, nb_txd,
                                SOCKET0, &tx_conf);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d, port=%u\n",
-                               ret, portid);
+                               ret, (unsigned) portid);
 
                /* Start device */
-               ret = rte_eth_dev_start((uint8_t) portid);
+               ret = rte_eth_dev_start(portid);
                if (ret < 0)
                        rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d, port=%u\n",
-                                 ret, portid);
+                                 ret, (unsigned) portid);
 
                printf("done: \n");
 
-               rte_eth_promiscuous_enable((uint8_t)portid);
+               rte_eth_promiscuous_enable(portid);
 
                printf("Port %u, MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n\n",
-                               portid,
+                               (unsigned) portid,
                                l2fwd_ports_eth_addr[portid].addr_bytes[0],
                                l2fwd_ports_eth_addr[portid].addr_bytes[1],
                                l2fwd_ports_eth_addr[portid].addr_bytes[2],
@@ -741,7 +740,7 @@ MAIN(int argc, char **argv)
                memset(&port_statistics, 0, sizeof(port_statistics));
        }
 
-       check_all_ports_link_status((uint8_t)nb_ports, l2fwd_enabled_port_mask);
+       check_all_ports_link_status(nb_ports, l2fwd_enabled_port_mask);
 
        /* launch per-lcore init on every lcore */
        rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MASTER);