X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=529356122777845b5d9ec565fe4d0c9ce54cf436;hb=8ad070e10246536fc1c514cbf16f2c51030cbee0;hp=b174587efdd2a46d5ce501f3408da05fa527d5be;hpb=e5060b33bd680aef7fb0ba80a5123532f07e6300;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index b174587efdd..52935612277 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -209,13 +209,13 @@ typedef struct
 	      /* shallow virtual reassembly output variables */
 	      struct
 	      {
-		u8 ip_proto;	/* protocol in ip header */
-		u8 icmp_type_or_tcp_flags;
-		u8 is_non_first_fragment;
-		u8 save_rewrite_length;
 		u16 l4_src_port;	/* tcp/udp/icmp src port */
 		u16 l4_dst_port;	/* tcp/udp/icmp dst port */
 		u32 tcp_ack_number;
+		u8 save_rewrite_length;
+		u8 ip_proto;	/* protocol in ip header */
+		u8 icmp_type_or_tcp_flags;
+		u8 is_non_first_fragment;
 		u32 tcp_seq_number;
 	      };
 	      /* full reassembly output variables */
@@ -397,6 +397,15 @@ STATIC_ASSERT (STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length)
 	       && VNET_REWRITE_TOTAL_BYTES < UINT8_MAX,
 	       "save_rewrite_length member must be able to hold the max value of rewrite length");
 
+STATIC_ASSERT (STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length)
+	       == STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+				    ip.reass.save_rewrite_length)
+	       && STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+				    mpls.save_rewrite_length) ==
+	       STRUCT_OFFSET_OF (vnet_buffer_opaque_t,
+				 ip.reass.save_rewrite_length),
+	       "save_rewrite_length must be aligned so that reass doesn't overwrite it");
+
 /*
  * The opaque field of the vlib_buffer_t is interpreted as a
  * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.