X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.h;h=60efe6e4027a8dfb6d81efe47a4507924b2fc108;hb=381e9a90748bb659f56081123052e3e95501a4b4;hp=86bee6f30d48e45165a345cc1f169184dc8f90a5;hpb=78c568905724af785e90185fd89fa8717b3b35c2;p=vpp.git

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 86bee6f30d4..60efe6e4027 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -85,10 +85,8 @@ enum
 
 #define foreach_buffer_opaque_union_subtype     \
 _(ip)                                           \
-_(swt)                                          \
 _(l2)                                           \
 _(l2t)                                          \
-_(gre)                                          \
 _(l2_classify)                                  \
 _(handoff)                                      \
 _(policer)                                      \
@@ -164,6 +162,7 @@ typedef struct
 	/* reassembly */
 	union
 	{
+	  u32 pad[2];		/* do not overlay w/ ip.adj_index[0,1] */
 	  /* in/out variables */
 	  struct
 	  {
@@ -210,13 +209,6 @@ typedef struct
       } bier;
     } mpls;
 
-    /* ip4-in-ip6 softwire termination, only valid there */
-    struct
-    {
-      u8 swt_disable;
-      u32 mapping_index;
-    } swt;
-
     /* l2 bridging path, only valid there */
     struct opaque_l2
     {
@@ -236,11 +228,6 @@ typedef struct
       u32 session_index;
     } l2t;
 
-    struct
-    {
-      u32 src, dst;
-    } gre;
-
     /* L2 classify */
     struct
     {