Harmonize vec/pool_get_aligned object sizes and alignment requests

[vpp.git] / src / vnet / bier / bier_imp.h

diff --git a/src/vnet/bier/bier_imp.h b/src/vnet/bier/bier_imp.h
index fa53989..cdc4dbb 100644 (file)
--- a/src/vnet/bier/bier_imp.h
+++ b/src/vnet/bier/bier_imp.h
@@ -33,14 +33,9 @@
  */
 typedef struct bier_imp_t_ {
     /**
-     * The BIER table into which to forward the post imposed packet
+     * Required for pool_get_aligned
      */
-    bier_table_id_t bi_tbl;
-
-    /**
-     * number of locks
-     */
-    u32 bi_locks;
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
 
     /**
      * The DPO contirubted from the resolving BIER table.
@@ -60,7 +55,18 @@ typedef struct bier_imp_t_ {
      *  largest header type so as the bitstring is on the same
      *  cacheline as the header.
      */
-    bier_bit_mask_4096_t bi_bits;
+    u8 bi_bits[BIER_HDR_BUCKETS_1024];
+
+    /**
+     * The BIER table into which to forward the post imposed packet
+     */
+    bier_table_id_t bi_tbl;
+
+    /**
+     * number of locks
+     */
+    u32 bi_locks;
+
 } bier_imp_t;
 
 extern index_t bier_imp_add_or_lock(const bier_table_id_t *bt,