examples/ip_frag: remove Tx fast free offload flag

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

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 1b51bf2..324d607 100644 (file)
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -242,16 +242,21 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 {
        struct rx_queue *rxq;
        uint32_t i, len, next_hop;
-       uint8_t ipv6;
-       uint16_t port_out;
+       uint16_t port_out, ether_type;
        int32_t len2;
+       uint64_t ol_flags;
+       const struct rte_ether_hdr *eth;
 
-       ipv6 = 0;
+       ol_flags = 0;
        rxq = &qconf->rx_queue_list[queueid];
 
        /* by default, send everything back to the source port */
        port_out = port_in;
 
+       /* save ether type of the incoming packet */
+       eth = rte_pktmbuf_mtod(m, const struct rte_ether_hdr *);
+       ether_type = eth->ether_type;
+
        /* Remove the Ethernet header and trailer from the input packet */
        rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
 
@@ -289,6 +294,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                        /* Free input packet */
                        rte_pktmbuf_free(m);
 
+                       /* request HW to regenerate IPv4 cksum */
+                       ol_flags |= (PKT_TX_IPV4 | PKT_TX_IP_CKSUM);
+
                        /* If we fail to fragment the packet */
                        if (unlikely (len2 < 0))
                                return;
@@ -297,8 +305,6 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                /* if this is an IPv6 packet */
                struct rte_ipv6_hdr *ip_hdr;
 
-               ipv6 = 1;
-
                /* Read the lookup key (i.e. ip_dst) from the input packet */
                ip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *);
 
@@ -348,23 +354,18 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
                        rte_panic("No headroom in mbuf.\n");
                }
 
+               m->ol_flags |= ol_flags;
                m->l2_len = sizeof(struct rte_ether_hdr);
 
                /* 02:00:00:00:00:xx */
                d_addr_bytes = &eth_hdr->d_addr.addr_bytes[0];
-               *((uint64_t *)d_addr_bytes) = 0x000000000002 + ((uint64_t)port_out << 40);
+               *((uint64_t *)d_addr_bytes) = 0x000000000002 +
+                       ((uint64_t)port_out << 40);
 
                /* src addr */
                rte_ether_addr_copy(&ports_eth_addr[port_out],
                                &eth_hdr->s_addr);
-               if (ipv6) {
-                       eth_hdr->ether_type =
-                               rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6);
-               } else {
-                       eth_hdr->ether_type =
-                               rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
-                       m->ol_flags |= (PKT_TX_IPV4 | PKT_TX_IP_CKSUM);
-               }
+               eth_hdr->ether_type = ether_type;
        }
 
        len += len2;
@@ -938,9 +939,6 @@ main(int argc, char **argv)
                n_tx_queue = nb_lcores;
                if (n_tx_queue > MAX_TX_QUEUE_PER_PORT)
                        n_tx_queue = MAX_TX_QUEUE_PER_PORT;
-               if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
-                       local_port_conf.txmode.offloads |=
-                               DEV_TX_OFFLOAD_MBUF_FAST_FREE;
                ret = rte_eth_dev_configure(portid, 1, (uint16_t)n_tx_queue,
                                            &local_port_conf);
                if (ret < 0) {
@@ -986,6 +984,7 @@ main(int argc, char **argv)
                printf("\n");
 
                /* init one TX queue per couple (lcore,port) */
+               rte_eth_dev_info_get(portid, &dev_info);
                queueid = 0;
                for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
                        if (rte_lcore_is_enabled(lcore_id) == 0)