mbuf: mark old VLAN offload flags as deprecated

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

diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index 0a89d94..e40aa66 100644 (file)
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -56,35 +56,27 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
        uint16_t i;
        uint64_t ol_flags = 0;
        uint64_t tx_offloads;
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
-       uint64_t start_tsc;
-       uint64_t end_tsc;
-       uint64_t core_cycles;
-#endif
+       uint64_t start_tsc = 0;
 
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
-       start_tsc = rte_rdtsc();
-#endif
+       get_start_cycles(&start_tsc);
 
        /*
         * Receive a burst of packets and forward them.
         */
        nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst,
                                 nb_pkt_per_burst);
-#ifdef RTE_TEST_PMD_RECORD_BURST_STATS
-       fs->rx_burst_stats.pkt_burst_spread[nb_rx]++;
-#endif
+       inc_rx_burst_stats(fs, nb_rx);
        if (unlikely(nb_rx == 0))
                return;
 
        fs->rx_packets += nb_rx;
        txp = &ports[fs->tx_port];
        tx_offloads = txp->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)
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_VLAN_INSERT)
+               ol_flags = PKT_TX_VLAN;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_QINQ_INSERT)
+               ol_flags |= PKT_TX_QINQ;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT)
                ol_flags |= PKT_TX_MACSEC;
        for (i = 0; i < nb_rx; i++) {
                if (likely(i < nb_rx - 1))
@@ -93,9 +85,9 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
                mb = pkts_burst[i];
                eth_hdr = rte_pktmbuf_mtod(mb, struct rte_ether_hdr *);
                rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
-                               &eth_hdr->d_addr);
+                               &eth_hdr->dst_addr);
                rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
-                               &eth_hdr->s_addr);
+                               &eth_hdr->src_addr);
                mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;
                mb->ol_flags |= ol_flags;
                mb->l2_len = sizeof(struct rte_ether_hdr);
@@ -117,20 +109,15 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
        }
 
        fs->tx_packets += nb_tx;
-#ifdef RTE_TEST_PMD_RECORD_BURST_STATS
-       fs->tx_burst_stats.pkt_burst_spread[nb_tx]++;
-#endif
+       inc_tx_burst_stats(fs, nb_tx);
        if (unlikely(nb_tx < nb_rx)) {
                fs->fwd_dropped += (nb_rx - nb_tx);
                do {
                        rte_pktmbuf_free(pkts_burst[nb_tx]);
                } while (++nb_tx < nb_rx);
        }
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
-       end_tsc = rte_rdtsc();
-       core_cycles = (end_tsc - start_tsc);
-       fs->core_cycles = (uint64_t) (fs->core_cycles + core_cycles);
-#endif
+
+       get_end_cycles(fs, start_tsc);
 }
 
 struct fwd_engine mac_fwd_engine = {