examples/ip_pipeline: move config files to separate directory

[dpdk.git] / lib / librte_ip_frag / rte_ipv6_reassembly.c

diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_frag/rte_ipv6_reassembly.c
index c622827..1f1c172 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv6_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c
@@ -45,6 +45,16 @@
  *
  */
 
+static inline void
+ip_frag_memmove(char *dst, char *src, int len)
+{
+       int i;
+
+       /* go backwards to make sure we don't overwrite anything important */
+       for (i = len - 1; i >= 0; i--)
+               dst[i] = src[i];
+}
+
 /*
  * Reassemble fragments into one packet.
  */
@@ -98,8 +108,7 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
        m->ol_flags |= PKT_TX_IP_CKSUM;
 
        /* update ipv6 header for the reassembled datagram */
-       ip_hdr = (struct ipv6_hdr *) (rte_pktmbuf_mtod(m, uint8_t *) +
-                                                                 m->pkt.vlan_macip.f.l2_len);
+       ip_hdr = rte_pktmbuf_mtod_offset(m, struct ipv6_hdr *, m->l2_len);
 
        ip_hdr->payload_len = rte_cpu_to_be_16(payload_len);
 
@@ -110,12 +119,11 @@ ipv6_frag_reassemble(const struct ip_frag_pkt *fp)
         * other headers, so we assume there are no other headers and thus update
         * the main IPv6 header instead.
         */
-       move_len = m->pkt.vlan_macip.f.l2_len + m->pkt.vlan_macip.f.l3_len -
-                       sizeof(*frag_hdr);
+       move_len = m->l2_len + m->l3_len - sizeof(*frag_hdr);
        frag_hdr = (struct ipv6_extension_fragment *) (ip_hdr + 1);
        ip_hdr->proto = frag_hdr->next_header;
 
-       memmove(rte_pktmbuf_mtod(m, char*) + sizeof(*frag_hdr),
+       ip_frag_memmove(rte_pktmbuf_mtod_offset(m, char *, sizeof(*frag_hdr)),
                        rte_pktmbuf_mtod(m, char*), move_len);
 
        rte_pktmbuf_adj(m, sizeof(*frag_hdr));