mbuf: add namespace to offload flags

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

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index 0d3664a..5737eaa 100644 (file)
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -99,12 +99,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
        vlan_tci_outer = ports[fs->tx_port].tx_vlan_id_outer;
 
        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;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_VLAN_INSERT)
+               ol_flags |= RTE_MBUF_F_TX_VLAN;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_QINQ_INSERT)
+               ol_flags |= RTE_MBUF_F_TX_QINQ;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT)
+               ol_flags |= RTE_MBUF_F_TX_MACSEC;
 
        for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) {
                if (!nb_pkt || !nb_clones) {
@@ -122,8 +122,8 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 
                        /* Initialize Ethernet header. */
                        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);
+                       rte_ether_addr_copy(&cfg_ether_dst, &eth_hdr->dst_addr);
+                       rte_ether_addr_copy(&cfg_ether_src, &eth_hdr->src_addr);
                        eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
 
                        /* Initialize IP header. */
@@ -152,7 +152,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                                                                   sizeof(*ip_hdr));
                        pkt->nb_segs            = 1;
                        pkt->pkt_len            = pkt_size;
-                       pkt->ol_flags           &= EXT_ATTACHED_MBUF;
+                       pkt->ol_flags           &= RTE_MBUF_F_EXTERNAL;
                        pkt->ol_flags           |= ol_flags;
                        pkt->vlan_tci           = vlan_tci;
                        pkt->vlan_tci_outer     = vlan_tci_outer;
@@ -201,10 +201,11 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
        get_end_cycles(fs, start_tsc);
 }
 
-static void
+static int
 flowgen_begin(portid_t pi)
 {
        printf("  number of flows for port %u: %d\n", pi, nb_flows_flowgen);
+       return 0;
 }
 
 struct fwd_engine flow_gen_engine = {