From: Olivier Matz
The rte_pktmbuf structure was initially included in the rte_mbuf
structure. This was needed when there was 2 types of mbuf (ctrl and
packet). As the control mbuf has been removed, we can merge the
rte_pktmbuf into the rte_mbuf structure.
Advantages of doing this:
- the access to mbuf fields is easier (ex: m->data instead of m->pkt.data)
- make the structure more consistent: for instance, there was no reason
to have the ol_flags field in rte_mbuf
- it will allow a deeper reorganization of the rte_mbuf structure in the
next commits, allowing to gain several bytes in it
Signed-off-by: Olivier Matz
Updated to work with latest code, and to include new example apps.
Changes in V2:
* Further updates to apply to latest HEAD on master
Signed-off-by: Bruce Richardson
---
app/test-pmd/cmdline.c | 1 -
app/test-pmd/csumonly.c| 6 +-
app/test-pmd/flowgen.c | 16 +--
app/test-pmd/icmpecho.c| 4 +-
app/test-pmd/ieee1588fwd.c | 6 +-
app/test-pmd/macfwd-retry.c| 2 +-
app/test-pmd/macfwd.c | 8 +-
app/test-pmd/macswap.c | 8 +-
app/test-pmd/rxonly.c | 12 +-
app/test-pmd/testpmd.c | 8 +-
app/test-pmd/testpmd.h | 2 +-
app/test-pmd/txonly.c | 42 +++---
app/test/commands.c| 1 -
app/test/packet_burst_generator.c | 46 +++
app/test/test_distributor.c| 18 +--
app/test/test_distributor_perf.c | 4 +-
app/test/test_mbuf.c | 12 +-
app/test/test_sched.c | 4 +-
app/test/test_table_acl.c | 6 +-
app/test/test_table_pipeline.c | 4 +-
examples/dpdk_qat/crypto.c | 22 ++--
examples/dpdk_qat/main.c | 2 +-
examples/exception_path/main.c | 10 +-
examples/ip_fragmentation/main.c | 6 +-
examples/ip_pipeline/pipeline_rx.c | 4 +-
examples/ip_pipeline/pipeline_tx.c | 2 +-
examples/ip_reassembly/main.c | 8 +-
examples/ipv4_multicast/main.c | 14 +-
examples/l3fwd-acl/main.c | 2 +-
examples/l3fwd-power/main.c| 2 +-
examples/l3fwd-vf/main.c | 2 +-
examples/l3fwd/main.c | 10 +-
examples/load_balancer/runtime.c | 2 +-
.../client_server_mp/mp_client/client.c| 2 +-
examples/quota_watermark/qw/main.c | 4 +-
examples/vhost/main.c | 100 +++
examples/vhost_xen/main.c | 22 ++--
lib/librte_distributor/rte_distributor.c | 2 +-
lib/librte_ip_frag/ip_frag_common.h| 14 +-
lib/librte_ip_frag/rte_ipv4_fragmentation.c| 40 +++---
lib/librte_ip_frag/rte_ipv4_reassembly.c | 6 +-
lib/librte_ip_frag/rte_ipv6_fragmentation.c| 38 +++---
lib/librte_ip_frag/rte_ipv6_reassembly.c | 4 +-
lib/librte_mbuf/rte_mbuf.c | 26 ++--
lib/librte_mbuf/rte_mbuf.h | 142 ++---
lib/librte_pmd_bond/rte_eth_bond_pmd.c | 4 +-
lib/librte_pmd_e1000/em_rxtx.c | 64 +-
lib/librte_pmd_e1000/igb_rxtx.c| 68 +-
lib/librte_pmd_i40e/i40e_rxtx.c| 98 +++---
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 100 +++
lib/librte_pmd_ixgbe/ixgbe_rxtx.h | 2 +-
lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c | 20 ++-
lib/librte_pmd_pcap/rte_eth_pcap.c | 14 +-
lib/librte_pmd_virtio/virtio_rxtx.c| 58 -
lib/librte_pmd_virtio/virtqueue.h | 2 +-
lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c | 26 ++--
lib/librte_pmd_xenvirt/rte_eth_xenvirt.c | 12 +-
lib/librte_pmd_xenvirt/virtqueue.h | 4 +-
lib/librte_port/rte_port_frag.c| 2 +-
lib/librte_sched/rte_sched.c | 14 +-
lib/librte_sched/rte_sched.h | 10 +-
61 files changed, 594 insertions(+), 600 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 6de38e6..67321f7 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6475,7 +6475,6 @@ dump_struct_sizes(void)
{
#define DUMP_SIZE(t) printf("sizeof(" #t ") = %u\n", (unsigned)sizeof(t));
DUMP_SIZE(struct rte
