scripts: relax line length check for fixed commit

[dpdk.git] / lib / librte_ip_frag / rte_ip_frag.h

diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h
index f1e7036..92cedf2 100644 (file)
--- a/lib/librte_ip_frag/rte_ip_frag.h
+++ b/lib/librte_ip_frag/rte_ip_frag.h
@@ -36,19 +36,25 @@
 
 /**
  * @file
- * RTE IPv4 Fragmentation and Reassembly
+ * RTE IP Fragmentation and Reassembly
  *
- * Implementation of IPv4 packet fragmentation and reassembly.
+ * Implementation of IP packet fragmentation and reassembly.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <stdio.h>
 
 #include <rte_malloc.h>
-#include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_ip.h>
 #include <rte_byteorder.h>
 
+struct rte_mbuf;
+
 enum {
        IP_LAST_FRAG_IDX,    /**< index of last fragment */
        IP_FIRST_FRAG_IDX,   /**< index of first fragment */
@@ -75,8 +81,8 @@ struct ip_frag_key {
  * @internal Fragmented packet to reassemble.
  * First two entries in the frags[] array are for the last and first fragments.
  */
-struct rte_ip_frag_pkt {
-       TAILQ_ENTRY(rte_ip_frag_pkt) lru;   /**< LRU list */
+struct ip_frag_pkt {
+       TAILQ_ENTRY(ip_frag_pkt) lru;   /**< LRU list */
        struct ip_frag_key key;           /**< fragmentation key */
        uint64_t             start;       /**< creation timestamp */
        uint32_t             total_size;  /**< expected reassembled size */
@@ -94,10 +100,10 @@ struct rte_ip_frag_death_row {
        /**< mbufs to be freed */
 };
 
-TAILQ_HEAD(rte_ip_pkt_list, rte_ip_frag_pkt); /**< @internal fragments tailq */
+TAILQ_HEAD(ip_pkt_list, ip_frag_pkt); /**< @internal fragments tailq */
 
 /** fragmentation table statistics */
-struct rte_ip_frag_tbl_stat {
+struct ip_frag_tbl_stat {
        uint64_t find_num;      /**< total # of find/insert attempts. */
        uint64_t add_num;       /**< # of add ops. */
        uint64_t del_num;       /**< # of del ops. */
@@ -115,26 +121,31 @@ struct rte_ip_frag_tbl {
        uint32_t             bucket_entries;  /**< hash assocaitivity. */
        uint32_t             nb_entries;      /**< total size of the table. */
        uint32_t             nb_buckets;      /**< num of associativity lines. */
-       struct rte_ip_frag_pkt *last;         /**< last used entry. */
-       struct rte_ip_pkt_list lru;           /**< LRU list for table entries. */
-       struct rte_ip_frag_tbl_stat stat;     /**< statistics counters. */
-       struct rte_ip_frag_pkt pkt[0];        /**< hash table. */
+       struct ip_frag_pkt *last;         /**< last used entry. */
+       struct ip_pkt_list lru;           /**< LRU list for table entries. */
+       struct ip_frag_tbl_stat stat;     /**< statistics counters. */
+       struct ip_frag_pkt pkt[0];        /**< hash table. */
 };
 
 /** IPv6 fragment extension header */
+#define        RTE_IPV6_EHDR_MF_SHIFT                  0
+#define        RTE_IPV6_EHDR_MF_MASK                   1
+#define        RTE_IPV6_EHDR_FO_SHIFT                  3
+#define        RTE_IPV6_EHDR_FO_MASK                   (~((1 << RTE_IPV6_EHDR_FO_SHIFT) - 1))
+
+#define RTE_IPV6_FRAG_USED_MASK                        \
+       (RTE_IPV6_EHDR_MF_MASK | RTE_IPV6_EHDR_FO_MASK)
+
+#define RTE_IPV6_GET_MF(x)                             ((x) & RTE_IPV6_EHDR_MF_MASK)
+#define RTE_IPV6_GET_FO(x)                             ((x) >> RTE_IPV6_EHDR_FO_SHIFT)
+
+#define RTE_IPV6_SET_FRAG_DATA(fo, mf) \
+       (((fo) & RTE_IPV6_EHDR_FO_MASK) | ((mf) & RTE_IPV6_EHDR_MF_MASK))
+
 struct ipv6_extension_fragment {
        uint8_t next_header;            /**< Next header type */
-       uint8_t reserved1;              /**< Reserved */
-       union {
-               struct {
-                       uint16_t frag_offset:13; /**< Offset from the start of the packet */
-                       uint16_t reserved2:2; /**< Reserved */
-                       uint16_t more_frags:1;
-                       /**< 1 if more fragments left, 0 if last fragment */
-               };
-               uint16_t frag_data;
-               /**< union of all fragmentation data */
-       };
+       uint8_t reserved;               /**< Reserved */
+       uint16_t frag_data;             /**< All fragmentation data */
        uint32_t id;                    /**< Packet ID */
 } __attribute__((__packed__));
 
@@ -204,7 +215,6 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                struct rte_mempool *pool_direct,
                struct rte_mempool *pool_indirect);
 
-
 /*
  * This function implements reassembly of fragmented IPv6 packets.
  * Incoming mbuf should have its l2_len/l3_len fields setup correctly.
@@ -346,4 +356,8 @@ void rte_ip_frag_free_death_row(struct rte_ip_frag_death_row *dr,
 void
 rte_ip_frag_table_statistics_dump(FILE * f, const struct rte_ip_frag_tbl *tbl);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_IP_FRAG_H_ */