mbuf: replace data pointer by an offset

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

diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index 1b2f661..2b3f0b9 100644 (file)
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -111,13 +111,13 @@ copy_buf_to_pkt_segs(void* buf, unsigned len, struct rte_mbuf *pkt,
                seg = seg->next;
        }
        copy_len = seg->data_len - offset;
-       seg_buf = ((char *) seg->data + offset);
+       seg_buf = (rte_pktmbuf_mtod(seg, char *) + offset);
        while (len > copy_len) {
                rte_memcpy(seg_buf, buf, (size_t) copy_len);
                len -= copy_len;
                buf = ((char*) buf + copy_len);
                seg = seg->next;
-               seg_buf = seg->data;
+               seg_buf = rte_pktmbuf_mtod(seg, char *);
        }
        rte_memcpy(seg_buf, buf, (size_t) len);
 }
@@ -126,7 +126,8 @@ static inline void
 copy_buf_to_pkt(void* buf, unsigned len, struct rte_mbuf *pkt, unsigned offset)
 {
        if (offset + len <= pkt->data_len) {
-               rte_memcpy(((char *) pkt->data + offset), buf, (size_t) len);
+               rte_memcpy((rte_pktmbuf_mtod(pkt, char *) + offset),
+                       buf, (size_t) len);
                return;
        }
        copy_buf_to_pkt_segs(buf, len, pkt, offset);
@@ -263,9 +264,9 @@ pkt_burst_transmit(struct fwd_stream *fs)
                pkt->nb_segs = tx_pkt_nb_segs;
                pkt->pkt_len = tx_pkt_length;
                pkt->ol_flags = ol_flags;
-               pkt->vlan_macip.f.vlan_tci  = vlan_tci;
-               pkt->vlan_macip.f.l2_len = sizeof(struct ether_hdr);
-               pkt->vlan_macip.f.l3_len = sizeof(struct ipv4_hdr);
+               pkt->vlan_tci  = vlan_tci;
+               pkt->l2_len = sizeof(struct ether_hdr);
+               pkt->l3_len = sizeof(struct ipv4_hdr);
                pkts_burst[nb_pkt] = pkt;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_pkt);