net/ring: add missing newlines in logs

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

diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
index 4ffcc7c..db666bb 100644 (file)
--- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
@@ -46,12 +46,6 @@
  *
  */
 
-/* Fragment Extension Header */
-#define        IPV6_HDR_MF_SHIFT                       0
-#define        IPV6_HDR_FO_SHIFT                       3
-#define        IPV6_HDR_MF_MASK                        (1 << IPV6_HDR_MF_SHIFT)
-#define        IPV6_HDR_FO_MASK                        ((1 << IPV6_HDR_FO_SHIFT) - 1)
-
 static inline void
 __fill_ipv6hdr_frag(struct ipv6_hdr *dst,
                const struct ipv6_hdr *src, uint16_t len, uint16_t fofs,
@@ -65,10 +59,8 @@ __fill_ipv6hdr_frag(struct ipv6_hdr *dst,
 
        fh = (struct ipv6_extension_fragment *) ++dst;
        fh->next_header = src->proto;
-       fh->reserved1   = 0;
-       fh->frag_offset = rte_cpu_to_be_16(fofs);
-       fh->reserved2   = 0;
-       fh->more_frags  = rte_cpu_to_be_16(mf);
+       fh->reserved = 0;
+       fh->frag_data = rte_cpu_to_be_16(RTE_IPV6_SET_FRAG_DATA(fofs, mf));
        fh->id = 0;
 }
 
@@ -118,12 +110,12 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
        frag_size = (uint16_t)(mtu_size - sizeof(struct ipv6_hdr));
 
        /* Fragment size should be a multiple of 8. */
-       IP_FRAG_ASSERT((frag_size & IPV6_HDR_FO_MASK) == 0);
+       RTE_ASSERT((frag_size & ~RTE_IPV6_EHDR_FO_MASK) == 0);
 
        /* Check that pkts_out is big enough to hold all fragments */
        if (unlikely (frag_size * nb_pkts_out <
            (uint16_t)(pkt_in->pkt_len - sizeof (struct ipv6_hdr))))
-               return (-EINVAL);
+               return -EINVAL;
 
        in_hdr = rte_pktmbuf_mtod(pkt_in, struct ipv6_hdr *);
 
@@ -142,7 +134,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                out_pkt = rte_pktmbuf_alloc(pool_direct);
                if (unlikely(out_pkt == NULL)) {
                        __free_fragments(pkts_out, out_pkt_pos);
-                       return (-ENOMEM);
+                       return -ENOMEM;
                }
 
                /* Reserve space for the IP header that will be built later */
@@ -160,7 +152,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                        if (unlikely(out_seg == NULL)) {
                                rte_pktmbuf_free(out_pkt);
                                __free_fragments(pkts_out, out_pkt_pos);
-                               return (-ENOMEM);
+                               return -ENOMEM;
                        }
                        out_seg_prev->next = out_seg;
                        out_seg_prev = out_seg;
@@ -211,5 +203,5 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                out_pkt_pos ++;
        }
 
-       return (out_pkt_pos);
+       return out_pkt_pos;
 }