[dpdk-dev] [memnic PATCH v2 17/17] pmd: adapt to new rte_mbuf structure

[Olivier Matz]

The rte_mbuf structure is modified by the following commits in dpdk:
 mbuf: rename vlan_macip_len in hw_offload and increase its size
 mbuf: change ol_flags to 32 bits
 mbuf: replace data pointer by an offset
 mbuf: merge physaddr and buf_len in a bitfield
 mbuf: remove the rte_pktmbuf structure
 mbuf: remove rte_ctrlmbuf

We need to modify to conform to this new struct.

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
---
 pmd/pmd_memnic.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pmd/pmd_memnic.c b/pmd/pmd_memnic.c
index 4abdf26..0ea932e 100644
--- a/pmd/pmd_memnic.c
+++ b/pmd/pmd_memnic.c
@@ -277,11 +277,11 @@ static uint16_t memnic_recv_pkts(void *rx_queue,
                        break;

                rte_memcpy(rte_pktmbuf_mtod(mb, void *), p->data, p->len);
-               mb->pkt.in_port = q->port_id;
-               mb->pkt.nb_segs = 1;
-               mb->pkt.next = NULL;
-               mb->pkt.pkt_len = p->len;
-               mb->pkt.data_len = p->len;
+               mb->in_port = q->port_id;
+               mb->nb_segs = 1;
+               mb->next = NULL;
+               mb->pkt_len = p->len;
+               mb->data_len = p->len;
                rx_pkts[nr] = mb;

                pkts++;
@@ -363,9 +363,9 @@ retry:
                p->len = pkt_len;

                ptr = p->data;
-               for (sg = tx_pkts[nr]; sg; sg = sg->pkt.next) {
+               for (sg = tx_pkts[nr]; sg; sg = sg->next) {
                        void *src = rte_pktmbuf_mtod(sg, void *);
-                       int data_len = sg->pkt.data_len;
+                       int data_len = sg->data_len;

                        rte_memcpy(ptr, src, data_len);
                        ptr += data_len;
-- 
1.9.2