X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=ed869d1f768065f9974ab1ff5571702ffa0eee06;hb=0f26c5a0138ac86d7ebd197c31a09d8d624c35fe;hp=f1cc637179a713bedfc2055339a86e4e67430cb6;hpb=ff542707733102b2573dca2496ea427b3dba3b10;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index f1cc637179a..ed869d1f768 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -73,7 +73,6 @@
 #define foreach_buffer_opaque_union_subtype     \
 _(ethernet)                                     \
 _(ip)                                           \
-_(mcast)                                        \
 _(swt)                                          \
 _(l2)                                           \
 _(l2t)                                          \
@@ -131,6 +130,9 @@ typedef struct
 
 	  /* Rewrite length */
 	  u32 save_rewrite_length;
+
+	  /* MFIB RPF ID */
+	  u32 rpf_id;
 	};
 
 	/* ICMP */
@@ -159,15 +161,6 @@ typedef struct
       u8 first;
     } mpls;
 
-    /* Multicast replication */
-    struct
-    {
-      u32 pad[3];
-      u32 mcast_group_index;
-      u32 mcast_current_index;
-      u32 original_free_list_index;
-    } mcast;
-
     /* ip4-in-ip6 softwire termination, only valid there */
     struct
     {
@@ -179,9 +172,11 @@ typedef struct
     struct
     {
       u32 feature_bitmap;
-      u16 bd_index;		// bridge-domain index
-      u8 l2_len;		// ethernet header length
-      u8 shg;			// split-horizon group
+      u16 bd_index;		/* bridge-domain index */
+      u8 l2_len;		/* ethernet header length */
+      u8 shg;			/* split-horizon group */
+      u8 bd_sn;			/* bridge domain seq# */
+      u8 int_sn;		/* interface seq# */
     } l2;
 
     /* l2tpv3 softwire encap, only valid there */
@@ -277,6 +272,16 @@ typedef struct
       u16 buffer_advance;
     } device_input_feat;
 
+    /* TCP */
+    struct
+    {
+      u32 connection_index;
+      u32 seq_number;
+      u32 seq_end;
+      u32 ack_number;
+      u8 flags;
+    } tcp;
+
     u32 unused[6];
   };
 } vnet_buffer_opaque_t;