app/testpmd: add qinq stripping and insertion

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

diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c
index aaece03..3b7fffb 100644 (file)
--- a/app/test-pmd/macfwd.c
+++ b/app/test-pmd/macfwd.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -51,7 +51,6 @@
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -85,6 +84,7 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
        uint16_t nb_rx;
        uint16_t nb_tx;
        uint16_t i;
+       uint64_t ol_flags = 0;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        uint64_t start_tsc;
        uint64_t end_tsc;
@@ -108,17 +108,22 @@ pkt_burst_mac_forward(struct fwd_stream *fs)
 #endif
        fs->rx_packets += nb_rx;
        txp = &ports[fs->tx_port];
+       if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_VLAN)
+               ol_flags = PKT_TX_VLAN_PKT;
+       if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
+               ol_flags |= PKT_TX_QINQ_PKT;
        for (i = 0; i < nb_rx; i++) {
                mb = pkts_burst[i];
-               eth_hdr = (struct ether_hdr *) mb->pkt.data;
+               eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
                ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
                                &eth_hdr->d_addr);
                ether_addr_copy(&ports[fs->tx_port].eth_addr,
                                &eth_hdr->s_addr);
-               mb->ol_flags = txp->tx_ol_flags;
-               mb->pkt.vlan_macip.f.l2_len = sizeof(struct ether_hdr);
-               mb->pkt.vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
-               mb->pkt.vlan_macip.f.vlan_tci = txp->tx_vlan_id;
+               mb->ol_flags = ol_flags;
+               mb->l2_len = sizeof(struct ether_hdr);
+               mb->l3_len = sizeof(struct ipv4_hdr);
+               mb->vlan_tci = txp->tx_vlan_id;
+               mb->vlan_tci_outer = txp->tx_vlan_id_outer;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx);
        fs->tx_packets += nb_tx;