eal: deprecate rte_snprintf

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

diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 9f4c669..3bb6afd 100644 (file)
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -228,7 +228,7 @@ static struct rte_eth_conf port_conf = {
        .rx_adv_conf = {
                        .rss_conf = {
                                .rss_key = NULL,
-                               .rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6,
+                               .rss_hf = ETH_RSS_IP,
                },
        },
        .txmode = {
@@ -310,11 +310,11 @@ struct rte_lpm6_config lpm6_config = {
 static struct rte_lpm *socket_lpm[RTE_MAX_NUMA_NODES];
 static struct rte_lpm6 *socket_lpm6[RTE_MAX_NUMA_NODES];
 
-#ifdef IPV6_FRAG_TBL_STAT
+#ifdef RTE_LIBRTE_IP_FRAG_TBL_STAT
 #define TX_LCORE_STAT_UPDATE(s, f, v)   ((s)->f += (v))
 #else
 #define TX_LCORE_STAT_UPDATE(s, f, v)   do {} while (0)
-#endif /* IPV6_FRAG_TBL_STAT */
+#endif /* RTE_LIBRTE_IP_FRAG_TBL_STAT */
 
 /*
  * If number of queued packets reached given threahold, then
@@ -942,19 +942,19 @@ setup_queue_tbl(struct rx_queue *rxq, uint32_t lcore, uint32_t queue)
        }
 
        /*
-        * At any given moment up to <max_flow_num * (MAX_FRAG_NUM - 1)>
+        * At any given moment up to <max_flow_num * (MAX_FRAG_NUM)>
         * mbufs could be stored int the fragment table.
         * Plus, each TX queue can hold up to <max_flow_num> packets.
         */
 
-       nb_mbuf = 2 * RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST) * MAX_FRAG_NUM;
+       nb_mbuf = RTE_MAX(max_flow_num, 2UL * MAX_PKT_BURST) * MAX_FRAG_NUM;
        nb_mbuf *= (port_conf.rxmode.max_rx_pkt_len + BUF_SIZE - 1) / BUF_SIZE;
-       nb_mbuf += RTE_TEST_RX_DESC_DEFAULT + RTE_TEST_TX_DESC_DEFAULT;
        nb_mbuf *= 2; /* ipv4 and ipv6 */
+       nb_mbuf += RTE_TEST_RX_DESC_DEFAULT + RTE_TEST_TX_DESC_DEFAULT;
 
        nb_mbuf = RTE_MAX(nb_mbuf, (uint32_t)NB_MBUF);
 
-       rte_snprintf(buf, sizeof(buf), "mbuf_pool_%u_%u", lcore, queue);
+       snprintf(buf, sizeof(buf), "mbuf_pool_%u_%u", lcore, queue);
 
        if ((rxq->pool = rte_mempool_create(buf, nb_mbuf, MBUF_SIZE, 0,
                        sizeof(struct rte_pktmbuf_pool_private),
@@ -990,7 +990,7 @@ init_mem(void)
 
                if (socket_lpm[socket] == NULL) {
                        RTE_LOG(INFO, IP_RSMBL, "Creating LPM table on socket %i\n", socket);
-                       rte_snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
+                       snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
 
                        lpm = rte_lpm_create(buf, socket, LPM_MAX_RULES, 0);
                        if (lpm == NULL) {
@@ -1002,7 +1002,7 @@ init_mem(void)
 
                if (socket_lpm6[socket] == NULL) {
                        RTE_LOG(INFO, IP_RSMBL, "Creating LPM6 table on socket %i\n", socket);
-                       rte_snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
+                       snprintf(buf, sizeof(buf), "IP_RSMBL_LPM_%i", socket);
 
                        lpm6 = rte_lpm6_create("IP_RSMBL_LPM6", socket, &lpm6_config);
                        if (lpm6 == NULL) {
@@ -1093,6 +1093,10 @@ MAIN(int argc, char **argv)
        if (init_mem() < 0)
                rte_panic("Cannot initialize memory structures!\n");
 
+       /* check if portmask has non-existent ports */
+       if (enabled_port_mask & ~(RTE_LEN2MASK(nb_ports, unsigned)))
+               rte_exit(EXIT_FAILURE, "Non-existent ports in portmask!\n");
+
        /* initialize all ports */
        for (portid = 0; portid < nb_ports; portid++) {
                /* skip ports that are not enabled */
@@ -1114,7 +1118,7 @@ MAIN(int argc, char **argv)
                        qconf = &lcore_queue_conf[rx_lcore_id];
                }
 
-               socket = rte_eth_dev_socket_id(portid);
+               socket = rte_lcore_to_socket_id(portid);
                if (socket == SOCKET_ID_ANY)
                        socket = 0;