net: add rte prefix to UDP structure

[dpdk.git] / app / test-pmd / flowgen.c

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index b13ff89..a970a27 100644 (file)
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -50,14 +50,12 @@
 #include <rte_cycles.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
 #include <rte_launch.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_memory.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_interrupts.h>
@@ -68,18 +66,19 @@
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_string_fns.h>
+#include <rte_flow.h>
 
 #include "testpmd.h"
 
 /* hardcoded configuration (for now) */
 static unsigned cfg_n_flows    = 1024;
-static uint32_t cfg_ip_src     = IPv4(10, 254, 0, 0);
-static uint32_t cfg_ip_dst     = IPv4(10, 253, 0, 0);
+static uint32_t cfg_ip_src     = RTE_IPv4(10, 254, 0, 0);
+static uint32_t cfg_ip_dst     = RTE_IPv4(10, 253, 0, 0);
 static uint16_t cfg_udp_src    = 1000;
 static uint16_t cfg_udp_dst    = 1001;
-static struct ether_addr cfg_ether_src =
+static struct rte_ether_addr cfg_ether_src =
        {{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x00 }};
-static struct ether_addr cfg_ether_dst =
+static struct rte_ether_addr cfg_ether_dst =
        {{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x01 }};
 
 #define IP_DEFTTL  64   /* from RFC 1340. */
@@ -120,16 +119,17 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
        struct rte_mbuf  *pkts_burst[MAX_PKT_BURST];
        struct rte_mempool *mbp;
        struct rte_mbuf  *pkt;
-       struct ether_hdr *eth_hdr;
-       struct ipv4_hdr *ip_hdr;
-       struct udp_hdr *udp_hdr;
+       struct rte_ether_hdr *eth_hdr;
+       struct rte_ipv4_hdr *ip_hdr;
+       struct rte_udp_hdr *udp_hdr;
        uint16_t vlan_tci, vlan_tci_outer;
-       uint16_t ol_flags;
+       uint64_t ol_flags = 0;
        uint16_t nb_rx;
        uint16_t nb_tx;
        uint16_t nb_pkt;
        uint16_t i;
        uint32_t retry;
+       uint64_t tx_offloads;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        uint64_t start_tsc;
        uint64_t end_tsc;
@@ -152,7 +152,14 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
        mbp = current_fwd_lcore()->mbp;
        vlan_tci = ports[fs->tx_port].tx_vlan_id;
        vlan_tci_outer = ports[fs->tx_port].tx_vlan_id_outer;
-       ol_flags = ports[fs->tx_port].tx_ol_flags;
+
+       tx_offloads = ports[fs->tx_port].dev_conf.txmode.offloads;
+       if (tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT)
+               ol_flags |= PKT_TX_VLAN_PKT;
+       if (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)
+               ol_flags |= PKT_TX_QINQ_PKT;
+       if (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT)
+               ol_flags |= PKT_TX_MACSEC;
 
        for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) {
                pkt = rte_mbuf_raw_alloc(mbp);
@@ -163,13 +170,13 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                pkt->next = NULL;
 
                /* Initialize Ethernet header. */
-               eth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);
-               ether_addr_copy(&cfg_ether_dst, &eth_hdr->d_addr);
-               ether_addr_copy(&cfg_ether_src, &eth_hdr->s_addr);
-               eth_hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
+               eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
+               rte_ether_addr_copy(&cfg_ether_dst, &eth_hdr->d_addr);
+               rte_ether_addr_copy(&cfg_ether_src, &eth_hdr->s_addr);
+               eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);
 
                /* Initialize IP header. */
-               ip_hdr = (struct ipv4_hdr *)(eth_hdr + 1);
+               ip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1);
                memset(ip_hdr, 0, sizeof(*ip_hdr));
                ip_hdr->version_ihl     = IP_VHL_DEF;
                ip_hdr->type_of_service = 0;
@@ -186,7 +193,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                                                 sizeof(*ip_hdr));
 
                /* Initialize UDP header. */
-               udp_hdr = (struct udp_hdr *)(ip_hdr + 1);
+               udp_hdr = (struct rte_udp_hdr *)(ip_hdr + 1);
                udp_hdr->src_port       = rte_cpu_to_be_16(cfg_udp_src);
                udp_hdr->dst_port       = rte_cpu_to_be_16(cfg_udp_dst);
                udp_hdr->dgram_cksum    = 0; /* No UDP checksum. */
@@ -198,8 +205,8 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                pkt->ol_flags           = ol_flags;
                pkt->vlan_tci           = vlan_tci;
                pkt->vlan_tci_outer     = vlan_tci_outer;
-               pkt->l2_len             = sizeof(struct ether_hdr);
-               pkt->l3_len             = sizeof(struct ipv4_hdr);
+               pkt->l2_len             = sizeof(struct rte_ether_hdr);
+               pkt->l3_len             = sizeof(struct rte_ipv4_hdr);
                pkts_burst[nb_pkt]      = pkt;
 
                next_flow = (next_flow + 1) % cfg_n_flows;