commit 7a6f5a4fee17bd34f70f9eb25a094764be39d81b
author Rajesh Goel <rajegoel@cisco.com> Tue Mar 17 14:43:09 2020 +0530
committer Damjan Marion <dmarion@me.com> Sat Mar 21 12:48:24 2020 +0000
tree e90867a2df748e8e1711f3b63acac287d123d352
parent 39d0285fca412ea2921fe1ae98a231894cd193cf

ipsec: efficient layout of ESP per thread data

Type: fix
Change-Id: I1ba921503a41ca37ce5c920682893617740571a9
Signed-off-by: Rajesh Goel <rajegoel@cisco.com>

src/vnet/ipsec/esp_decrypt.c

diff --git a/src/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c
index f29dacb..3668948 100644
--- a/src/vnet/ipsec/esp_decrypt.c
+++ b/src/vnet/ipsec/esp_decrypt.c
@@ -98,6 +98,7 @@
 
 typedef struct
 {
+  vlib_buffer_t *lb;
   union
   {
     struct
@@ -111,15 +112,15 @@
   };
 
   u32 seq;
+  u32 free_buffer_index;
   i16 current_data;
   i16 current_length;
   u16 hdr_sz;
-  vlib_buffer_t *lb;
-  u32 free_buffer_index;
   u8 icv_removed;
+  u8 __unused;
 } esp_decrypt_packet_data_t;
 
-STATIC_ASSERT_SIZEOF (esp_decrypt_packet_data_t, 5 * sizeof (u64));
+STATIC_ASSERT_SIZEOF (esp_decrypt_packet_data_t, 4 * sizeof (u64));
 
 #define ESP_ENCRYPT_PD_F_FD_TRANSPORT (1 << 2)