mbuf: flatten struct vlan_macip

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index e8a4b45d7d46792248eb7b911f575c26cc4f425a..b426dfc3d6eb4023b98847af2f60457cb4fe84e4 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -398,18 +398,17 @@ testpmd_mbuf_ctor(struct rte_mempool *mp,
        mb_ctor_arg = (struct mbuf_ctor_arg *) opaque_arg;
        mb = (struct rte_mbuf *) raw_mbuf;
 
-       mb->type         = RTE_MBUF_PKT;
        mb->pool         = mp;
        mb->buf_addr     = (void *) ((char *)mb + mb_ctor_arg->seg_buf_offset);
        mb->buf_physaddr = (uint64_t) (rte_mempool_virt2phy(mp, mb) +
                        mb_ctor_arg->seg_buf_offset);
        mb->buf_len      = mb_ctor_arg->seg_buf_size;
-       mb->type         = RTE_MBUF_PKT;
        mb->ol_flags     = 0;
-       mb->pkt.data     = (char *) mb->buf_addr + RTE_PKTMBUF_HEADROOM;
-       mb->pkt.nb_segs  = 1;
-       mb->pkt.vlan_macip.data = 0;
-       mb->pkt.hash.rss = 0;
+       mb->data         = (char *) mb->buf_addr + RTE_PKTMBUF_HEADROOM;
+       mb->nb_segs      = 1;
+       mb->l2_l3_len       = 0;
+       mb->vlan_tci     = 0;
+       mb->hash.rss     = 0;
 }
 
 static void
@@ -614,7 +613,9 @@ init_config(void)
         * Records which Mbuf pool to use by each logical core, if needed.
         */
        for (lc_id = 0; lc_id < nb_lcores; lc_id++) {
-               mbp = mbuf_pool_find(rte_lcore_to_socket_id(lc_id));
+               mbp = mbuf_pool_find(
+                       rte_lcore_to_socket_id(fwd_lcores_cpuids[lc_id]));
+
                if (mbp == NULL)
                        mbp = mbuf_pool_find(0);
                fwd_lcores[lc_id]->mbp = mbp;
@@ -1513,6 +1514,18 @@ all_ports_stopped(void)
        return 1;
 }
 
+int
+port_is_started(portid_t port_id)
+{
+       if (port_id_is_invalid(port_id))
+               return -1;
+
+       if (ports[port_id].port_status != RTE_PORT_STARTED)
+               return 0;
+
+       return 1;
+}
+
 void
 pmd_test_exit(void)
 {