remove unused ring includes

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

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 93ea2a1..e1e32c6 100644 (file)
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -64,7 +64,6 @@
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_lpm.h>
@@ -76,8 +75,6 @@
 
 #define RTE_LOGTYPE_IP_FRAG RTE_LOGTYPE_USER1
 
-#define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
-
 /* allow max jumbo frame 9.5 KB */
 #define JUMBO_FRAME_MAX_SIZE   0x2600
 
@@ -268,8 +265,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                uint8_t queueid, uint8_t port_in)
 {
        struct rx_queue *rxq;
-       uint32_t i, len;
-       uint8_t next_hop, port_out, ipv6;
+       uint32_t i, len, next_hop_ipv4;
+       uint8_t next_hop_ipv6, port_out, ipv6;
        int32_t len2;
 
        ipv6 = 0;
@@ -285,7 +282,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
        len = qconf->tx_mbufs[port_out].len;
 
        /* if this is an IPv4 packet */
-       if (m->ol_flags & PKT_RX_IPV4_HDR) {
+       if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
                struct ipv4_hdr *ip_hdr;
                uint32_t ip_dst;
                /* Read the lookup key (i.e. ip_dst) from the input packet */
@@ -293,9 +290,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                ip_dst = rte_be_to_cpu_32(ip_hdr->dst_addr);
 
                /* Find destination port */
-               if (rte_lpm_lookup(rxq->lpm, ip_dst, &next_hop) == 0 &&
-                               (enabled_port_mask & 1 << next_hop) != 0) {
-                       port_out = next_hop;
+               if (rte_lpm_lookup(rxq->lpm, ip_dst, &next_hop_ipv4) == 0 &&
+                               (enabled_port_mask & 1 << next_hop_ipv4) != 0) {
+                       port_out = next_hop_ipv4;
 
                        /* Build transmission burst for new port */
                        len = qconf->tx_mbufs[port_out].len;
@@ -319,9 +316,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                        if (unlikely (len2 < 0))
                                return;
                }
-       }
-       /* if this is an IPv6 packet */
-       else if (m->ol_flags & PKT_RX_IPV6_HDR) {
+       } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
+               /* if this is an IPv6 packet */
                struct ipv6_hdr *ip_hdr;
 
                ipv6 = 1;
@@ -330,9 +326,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                ip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);
 
                /* Find destination port */
-               if (rte_lpm6_lookup(rxq->lpm6, ip_hdr->dst_addr, &next_hop) == 0 &&
-                               (enabled_port_mask & 1 << next_hop) != 0) {
-                       port_out = next_hop;
+               if (rte_lpm6_lookup(rxq->lpm6, ip_hdr->dst_addr, &next_hop_ipv6) == 0 &&
+                               (enabled_port_mask & 1 << next_hop_ipv6) != 0) {
+                       port_out = next_hop_ipv6;
 
                        /* Build transmission burst for new port */
                        len = qconf->tx_mbufs[port_out].len;
@@ -634,7 +630,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
-                       if (link.link_status == 0) {
+                       if (link.link_status == ETH_LINK_DOWN) {
                                all_ports_up = 0;
                                break;
                        }
@@ -724,6 +720,7 @@ init_mem(void)
        struct rte_mempool *mp;
        struct rte_lpm *lpm;
        struct rte_lpm6 *lpm6;
+       struct rte_lpm_config lpm_config;
        int socket;
        unsigned lcore_id;
 
@@ -744,12 +741,8 @@ init_mem(void)
                                        socket);
                        snprintf(buf, sizeof(buf), "pool_direct_%i", socket);
 
-                       mp = rte_mempool_create(buf, NB_MBUF,
-                                                  MBUF_SIZE, 32,
-                                                  sizeof(struct rte_pktmbuf_pool_private),
-                                                  rte_pktmbuf_pool_init, NULL,
-                                                  rte_pktmbuf_init, NULL,
-                                                  socket, 0);
+                       mp = rte_pktmbuf_pool_create(buf, NB_MBUF, 32,
+                               0, RTE_MBUF_DEFAULT_BUF_SIZE, socket);
                        if (mp == NULL) {
                                RTE_LOG(ERR, IP_FRAG, "Cannot create direct mempool\n");
                                return -1;
@@ -762,12 +755,8 @@ init_mem(void)
                                        socket);
                        snprintf(buf, sizeof(buf), "pool_indirect_%i", socket);
 
-                       mp = rte_mempool_create(buf, NB_MBUF,
-                                                          sizeof(struct rte_mbuf), 32,
-                                                          0,
-                                                          NULL, NULL,
-                                                          rte_pktmbuf_init, NULL,
-                                                          socket, 0);
+                       mp = rte_pktmbuf_pool_create(buf, NB_MBUF, 32, 0, 0,
+                               socket);
                        if (mp == NULL) {
                                RTE_LOG(ERR, IP_FRAG, "Cannot create indirect mempool\n");
                                return -1;
@@ -779,7 +768,11 @@ init_mem(void)
                        RTE_LOG(INFO, IP_FRAG, "Creating LPM table on socket %i\n", socket);
                        snprintf(buf, sizeof(buf), "IP_FRAG_LPM_%i", socket);
 
-                       lpm = rte_lpm_create(buf, socket, LPM_MAX_RULES, 0);
+                       lpm_config.max_rules = LPM_MAX_RULES;
+                       lpm_config.number_tbl8s = 256;
+                       lpm_config.flags = 0;
+
+                       lpm = rte_lpm_create(buf, socket, &lpm_config);
                        if (lpm == NULL) {
                                RTE_LOG(ERR, IP_FRAG, "Cannot create LPM table\n");
                                return -1;
@@ -791,7 +784,7 @@ init_mem(void)
                        RTE_LOG(INFO, IP_FRAG, "Creating LPM6 table on socket %i\n", socket);
                        snprintf(buf, sizeof(buf), "IP_FRAG_LPM_%i", socket);
 
-                       lpm6 = rte_lpm6_create("IP_FRAG_LPM6", socket, &lpm6_config);
+                       lpm6 = rte_lpm6_create(buf, socket, &lpm6_config);
                        if (lpm6 == NULL) {
                                RTE_LOG(ERR, IP_FRAG, "Cannot create LPM table\n");
                                return -1;
@@ -830,9 +823,7 @@ main(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "Invalid arguments");
 
        nb_ports = rte_eth_dev_count();
-       if (nb_ports > RTE_MAX_ETHPORTS)
-               nb_ports = RTE_MAX_ETHPORTS;
-       else if (nb_ports == 0)
+       if (nb_ports == 0)
                rte_exit(EXIT_FAILURE, "No ports found!\n");
 
        nb_lcores = rte_lcore_count();