From 8e0af7a7ffb0d6208c91e74eeaa0e46f3ac29026 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 17 Mar 2022 17:27:31 +0000 Subject: vnet: Remove the unused fields from opaque2 Type: refactor Signed-off-by: Neale Ranns Change-Id: Ibb6d19de053c306e9758dbfa827ab7bcab5de856 --- src/vnet/buffer.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/vnet/buffer.h') diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h index aa5d12e0754..2f2524590e9 100644 --- a/src/vnet/buffer.h +++ b/src/vnet/buffer.h @@ -495,15 +495,7 @@ typedef struct }; } nat; - union - { - struct - { - u64 pad[1]; - u64 pg_replay_timestamp; - }; - u32 unused[8]; - }; + u32 unused[8]; } vnet_buffer_opaque2_t; #define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2) @@ -512,8 +504,8 @@ typedef struct * The opaque2 field of the vlib_buffer_t is interpreted as a * vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one. */ -STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <= - STRUCT_SIZE_OF (vlib_buffer_t, opaque2), +STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) == + STRUCT_SIZE_OF (vlib_buffer_t, opaque2), "VNET buffer opaque2 meta-data too large for vlib_buffer"); #define gso_mtu_sz(b) (vnet_buffer2(b)->gso_size + \ -- cgit 1.2.3-korg