From 3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934 Mon Sep 17 00:00:00 2001 From: Ole Trøan Date: Fri, 15 Mar 2019 16:14:41 +0000 Subject: Revert "API: Cleanup APIs interface.api" This reverts commit e63325e3ca03c847963863446345e6c80a2c0cfd. Allow time for CSIT to accommodate. Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2 Signed-off-by: ot@cisco.com --- src/vat/vat.h | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'src/vat/vat.h') 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; -- cgit 1.2.3-korg