From: Rajesh Goel <rajegoel@cisco.com>
Date: Tue, 17 Mar 2020 09:13:09 +0000 (+0530)
Subject: ipsec: efficient layout of ESP per thread data
X-Git-Tag: v20.09-rc0~368
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=7a6f5a4fee17bd34f70f9eb25a094764be39d81b

ipsec: efficient layout of ESP per thread data

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

diff --git a/src/vnet/ipsec/esp_decrypt.c b/src/vnet/ipsec/esp_decrypt.c
index f29dacb3dc7..36689480538 100644
--- a/src/vnet/ipsec/esp_decrypt.c
+++ b/src/vnet/ipsec/esp_decrypt.c
@@ -98,6 +98,7 @@ format_esp_decrypt_trace (u8 * s, va_list * args)
 
 typedef struct
 {
+  vlib_buffer_t *lb;
   union
   {
     struct
@@ -111,15 +112,15 @@ typedef struct
   };
 
   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)