test mbuf attach

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

diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
index 4707119..e9de335 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@ -8,26 +8,27 @@
 #include <rte_memcpy.h>
 #include <rte_mempool.h>
 #include <rte_debug.h>
+#include <rte_ether.h>
 
 #include "ip_frag_common.h"
 
 /* Fragment Offset */
-#define        IPV4_HDR_DF_SHIFT                       14
-#define        IPV4_HDR_MF_SHIFT                       13
-#define        IPV4_HDR_FO_SHIFT                       3
+#define        RTE_IPV4_HDR_DF_SHIFT                   14
+#define        RTE_IPV4_HDR_MF_SHIFT                   13
+#define        RTE_IPV4_HDR_FO_SHIFT                   3
 
-#define        IPV4_HDR_DF_MASK                        (1 << IPV4_HDR_DF_SHIFT)
-#define        IPV4_HDR_MF_MASK                        (1 << IPV4_HDR_MF_SHIFT)
+#define        IPV4_HDR_DF_MASK                        (1 << RTE_IPV4_HDR_DF_SHIFT)
+#define        IPV4_HDR_MF_MASK                        (1 << RTE_IPV4_HDR_MF_SHIFT)
 
-#define        IPV4_HDR_FO_ALIGN                       (1 << IPV4_HDR_FO_SHIFT)
+#define        IPV4_HDR_FO_ALIGN                       (1 << RTE_IPV4_HDR_FO_SHIFT)
 
 static inline void __fill_ipv4hdr_frag(struct rte_ipv4_hdr *dst,
                const struct rte_ipv4_hdr *src, uint16_t len, uint16_t fofs,
                uint16_t dofs, uint32_t mf)
 {
        rte_memcpy(dst, src, sizeof(*dst));
-       fofs = (uint16_t)(fofs + (dofs >> IPV4_HDR_FO_SHIFT));
-       fofs = (uint16_t)(fofs | mf << IPV4_HDR_MF_SHIFT);
+       fofs = (uint16_t)(fofs + (dofs >> RTE_IPV4_HDR_FO_SHIFT));
+       fofs = (uint16_t)(fofs | mf << RTE_IPV4_HDR_MF_SHIFT);
        dst->fragment_offset = rte_cpu_to_be_16(fofs);
        dst->total_length = rte_cpu_to_be_16(len);
        dst->hdr_checksum = 0;
@@ -76,6 +77,15 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
        uint16_t fragment_offset, flag_offset, frag_size;
        uint16_t frag_bytes_remaining;
 
+       /*
+        * Formal parameter checking.
+        */
+       if (unlikely(pkt_in == NULL) || unlikely(pkts_out == NULL) ||
+           unlikely(nb_pkts_out == 0) ||
+           unlikely(pool_direct == NULL) || unlikely(pool_indirect == NULL) ||
+           unlikely(mtu_size < RTE_ETHER_MIN_MTU))
+               return -EINVAL;
+
        /*
         * Ensure the IP payload length of all fragments is aligned to a
         * multiple of 8 bytes as per RFC791 section 2.3.
@@ -173,7 +183,6 @@ rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
                fragment_offset = (uint16_t)(fragment_offset +
                    out_pkt->pkt_len - sizeof(struct rte_ipv4_hdr));
 
-               out_pkt->ol_flags |= PKT_TX_IP_CKSUM;
                out_pkt->l3_len = sizeof(struct rte_ipv4_hdr);
 
                /* Write the fragment to the output list */