X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2F5tswap.c;h=e8cef9623b23ce3ddb4a0df16d21997b5c21aa43;hb=3127f99274b679124658afdbfc49210730c50617;hp=04f035bb450ff08b3ddebd13860909da0f3615c4;hpb=bc700b6767278e49c4ea9c08bb43c0fd9ca3e70d;p=dpdk.git diff --git a/app/test-pmd/5tswap.c b/app/test-pmd/5tswap.c index 04f035bb45..e8cef9623b 100644 --- a/app/test-pmd/5tswap.c +++ b/app/test-pmd/5tswap.c @@ -114,13 +114,10 @@ pkt_burst_5tuple_swap(struct fwd_stream *fs) */ nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, nb_pkt_per_burst); + inc_rx_burst_stats(fs, nb_rx); if (unlikely(nb_rx == 0)) return; -#ifdef RTE_TEST_PMD_RECORD_BURST_STATS - fs->rx_burst_stats.pkt_burst_spread[nb_rx]++; -#endif - fs->rx_packets += nb_rx; txp = &ports[fs->tx_port]; ol_flags = ol_flags_init(txp->dev_conf.txmode.offloads); @@ -145,7 +142,7 @@ pkt_burst_5tuple_swap(struct fwd_stream *fs) if (proto == RTE_BE16(RTE_ETHER_TYPE_IPV4)) { swap_ipv4(h.ipv4); next_proto = h.ipv4->next_proto_id; - mb->l3_len = (h.ipv4->version_ihl & 0x0f) * 4; + mb->l3_len = rte_ipv4_hdr_len(h.ipv4); h.byte += mb->l3_len; } else if (proto == RTE_BE16(RTE_ETHER_TYPE_IPV6)) { swap_ipv6(h.ipv6); @@ -178,9 +175,7 @@ pkt_burst_5tuple_swap(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 {