X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fvat.h;h=bcaddfe01267db2351c0e67e64d24424c335136a;hb=053204ab039d34a990ff0e14c32ce3b294fcce0e;hp=0d93af7b0f2e0dfe56fff21842eea0e46b14e4df;hpb=b09f4d0adb8364b3516c3a64e8238715887ffec8;p=vpp.git

diff --git a/src/vat/vat.h b/src/vat/vat.h
index 0d93af7b0f2..bcaddfe0126 100644
--- a/src/vat/vat.h
+++ b/src/vat/vat.h
@@ -48,17 +48,27 @@ typedef struct
    */
   u32 sub_id;
 
-  /* 0 = dot1q, 1=dot1ad */
-  u8 sub_dot1ad;
-
   /* Number of tags 0-2 */
   u8 sub_number_of_tags;
   u16 sub_outer_vlan_id;
   u16 sub_inner_vlan_id;
-  u8 sub_exact_match;
-  u8 sub_default;
-  u8 sub_outer_vlan_id_any;
-  u8 sub_inner_vlan_id_any;
+
+  union
+  {
+    u16 raw_flags;
+    struct
+    {
+      u16 no_tags:1;
+      u16 one_tag:1;
+      u16 two_tags:1;
+      /* 0 = dot1q, 1=dot1ad */
+      u16 sub_dot1ad:1;
+      u16 sub_exact_match:1;
+      u16 sub_default:1;
+      u16 sub_outer_vlan_id_any:1;
+      u16 sub_inner_vlan_id_any:1;
+    };
+  };
 
   /* vlan tag rewrite */
   u32 vtr_op;
@@ -216,9 +226,7 @@ typedef struct
   socket_client_main_t *socket_client_main;
   u8 *socket_name;
 
-#if VPP_API_TEST_BUILTIN == 0
   elog_main_t elog_main;
-#endif
 
   /* Convenience */
   vlib_main_t *vlib_main;