api: binary api cleanup

[vpp.git] / src / vnet / buffer.h

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 6738f3c..5a3bc3f 100644 (file)
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -276,6 +276,7 @@ typedef struct
     struct
     {
       u32 sad_index;
+      u32 protect_index;
     } ipsec;
 
     /* MAP */
@@ -326,7 +327,11 @@ typedef struct
     struct
     {
       u32 connection_index;
-      u32 seq_number;
+      union
+      {
+       u32 seq_number;
+       u32 next_node_opaque;
+      };
       u32 seq_end;
       u32 ack_number;
       u16 hdr_offset;          /**< offset relative to ip hdr */
@@ -335,20 +340,6 @@ typedef struct
       u8 flags;
     } tcp;
 
-    /* SCTP */
-    struct
-    {
-      u32 connection_index;
-      u16 sid; /**< Stream ID */
-      u16 ssn; /**< Stream Sequence Number */
-      u32 tsn; /**< Transmission Sequence Number */
-      u16 hdr_offset;          /**< offset relative to ip hdr */
-      u16 data_offset;         /**< offset relative to ip hdr */
-      u16 data_len;            /**< data len */
-      u8 subconn_idx; /**< index of the sub_connection being used */
-      u8 flags;
-    } sctp;
-
     /* SNAT */
     struct
     {
@@ -436,7 +427,10 @@ 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 + vnet_buffer2(b)->gso_l4_hdr_sz + vnet_buffer(b)->l4_hdr_offset)
+#define gso_mtu_sz(b) (vnet_buffer2(b)->gso_size + \
+                       vnet_buffer2(b)->gso_l4_hdr_sz + \
+                       vnet_buffer(b)->l4_hdr_offset - \
+                       vnet_buffer (b)->l3_hdr_offset)
 
 
 format_function_t format_vnet_buffer;