From 88076749e663e35925c2212eb79e2ec4ce023772 Mon Sep 17 00:00:00 2001 From: Mike Bly Date: Mon, 24 Sep 2018 10:13:06 -0700 Subject: [PATCH] Enabled untagged vs default functionality Removed 0-tags attribute for default-sub-if config Moved default-sub-if check before untagged Change-Id: I68043445aa2f79846e0743567b9015257fd87f8d Signed-off-by: Mike Bly --- src/vnet/ethernet/ethernet.h | 8 ++++---- src/vnet/ethernet/node.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h index cc44c4e2cf0..ece7aa58217 100644 --- a/src/vnet/ethernet/ethernet.h +++ b/src/vnet/ethernet/ethernet.h @@ -529,13 +529,13 @@ eth_identify_subint (vnet_hw_interface_t * hi, if ((subint->flags & match_flags) == match_flags) goto matched; - // check for untagged interface - subint = &main_intf->untagged_subint; + // check for default interface + subint = &main_intf->default_subint; if ((subint->flags & match_flags) == match_flags) goto matched; - // check for default interface - subint = &main_intf->default_subint; + // check for untagged interface + subint = &main_intf->untagged_subint; if ((subint->flags & match_flags) == match_flags) goto matched; diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c index 383d5d28290..3cc501d0577 100755 --- a/src/vnet/ethernet/node.c +++ b/src/vnet/ethernet/node.c @@ -850,8 +850,7 @@ ethernet_sw_interface_get_config (vnet_main_t * vnm, else if (si->sub.eth.flags.default_sub) { subint = &main_intf->default_subint; - *flags = SUBINT_CONFIG_MATCH_0_TAG | - SUBINT_CONFIG_MATCH_1_TAG | + *flags = SUBINT_CONFIG_MATCH_1_TAG | SUBINT_CONFIG_MATCH_2_TAG | SUBINT_CONFIG_MATCH_3_TAG; } else if ((si->sub.eth.flags.no_tags) || (si->sub.eth.raw_flags == 0)) -- 2.16.6