X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Fethernet.h;h=ece7aa582177c76083a6c73c3783729fa2823025;hb=88076749e663e35925c2212eb79e2ec4ce023772;hp=9a23448b3e60cfb60e89a553912f9be2d69c25d8;hpb=de5b08fb302e84142e4ba0cf0cbed4e740e4165c;p=vpp.git diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h index 9a23448b3e6..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; @@ -553,7 +553,7 @@ matched: // Compare two ethernet macs. Return 1 if they are the same, 0 if different always_inline u32 -eth_mac_equal (u8 * mac1, u8 * mac2) +eth_mac_equal (const u8 * mac1, const u8 * mac2) { return (*((u32 *) (mac1 + 0)) == *((u32 *) (mac2 + 0)) && *((u32 *) (mac1 + 2)) == *((u32 *) (mac2 + 2)));