lib: fix cache alignment of structures

[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 13249d3..3989a5a 100644 (file)
--- a/lib/librte_ip_frag/rte_ip_frag.h
+++ b/lib/librte_ip_frag/rte_ip_frag.h
@@ -36,9 +36,9 @@
 
 /**
  * @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.
  */
 
 #include <stdint.h>
@@ -46,7 +46,9 @@
 
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_ip.h>
+#include <rte_byteorder.h>
 
 enum {
        IP_LAST_FRAG_IDX,    /**< index of last fragment */
@@ -74,8 +76,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 */
@@ -93,10 +95,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. */
@@ -114,10 +116,10 @@ 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 */
@@ -174,6 +176,7 @@ rte_ip_frag_table_destroy( struct rte_ip_frag_tbl *tbl)
        rte_free(tbl);
 }
 
+#ifdef RTE_MBUF_REFCNT
 /**
  * This function implements the fragmentation of IPv6 packets.
  *
@@ -202,7 +205,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
                uint16_t mtu_size,
                struct rte_mempool *pool_direct,
                struct rte_mempool *pool_indirect);
-
+#endif
 
 /*
  * This function implements reassembly of fragmented IPv6 packets.
@@ -251,6 +254,7 @@ rte_ipv6_frag_get_ipv6_fragment_header(struct ipv6_hdr *hdr)
                return NULL;
 }
 
+#ifdef RTE_MBUF_REFCNT
 /**
  * IPv4 fragmentation.
  *
@@ -279,6 +283,7 @@ int32_t rte_ipv4_fragment_packet(struct rte_mbuf *pkt_in,
                        uint16_t nb_pkts_out, uint16_t mtu_size,
                        struct rte_mempool *pool_direct,
                        struct rte_mempool *pool_indirect);
+#endif
 
 /*
  * This function implements reassembly of fragmented IPv4 packets.