1 files changed, 7 insertions, 17 deletions
diff --git a/src/vat/vat.h b/src/vat/vat.h
index d380abeaf12..c9384a1ce57 100644
--- a/src/vat/vat.h
+++ b/src/vat/vat.h
@@ -47,27 +47,17 @@ 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;
-
-  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;
-    };
-  };
+  u8 sub_exact_match;
+  u8 sub_default;
+  u8 sub_outer_vlan_id_any;
+  u8 sub_inner_vlan_id_any;
 
   /* vlan tag rewrite */
   u32 vtr_op;