fib: Don't use [midchain] adjacencies to change an interface's feature arc

[vpp.git] / src / vnet / ethernet / packet.h

diff --git a/src/vnet/ethernet/packet.h b/src/vnet/ethernet/packet.h
index 04ce420..e1e42ba 100644 (file)
--- a/src/vnet/ethernet/packet.h
+++ b/src/vnet/ethernet/packet.h
@@ -89,7 +89,7 @@ ethernet_address_set_locally_administered (u8 * a)
 }
 
 always_inline int
-eh_dst_addr_to_rx_ctype (ethernet_header_t * eh)
+eh_dst_addr_to_rx_ctype (const ethernet_header_t * eh)
 {
   if (PREDICT_TRUE (ethernet_address_cast (eh->dst_address) ==
                    ETHERNET_ADDRESS_UNICAST))
@@ -107,7 +107,7 @@ eh_dst_addr_to_rx_ctype (ethernet_header_t * eh)
 }
 
 always_inline int
-eh_dst_addr_to_tx_ctype (ethernet_header_t * eh)
+eh_dst_addr_to_tx_ctype (const ethernet_header_t * eh)
 {
   if (PREDICT_TRUE (ethernet_address_cast (eh->dst_address) ==
                    ETHERNET_ADDRESS_UNICAST))
@@ -142,8 +142,8 @@ ethernet_vlan_header_set_priority_net_order (ethernet_vlan_header_t * h,
 {
   u8 *bytes = (u8 *) (&h->priority_cfi_and_id);
 
-  bytes[0] &= 0x1f;
-  bytes[0] |= (prio & 0x7) << 5;
+  bytes[0] &= 0x0f;
+  bytes[0] |= (prio & 0xf) << 4;
 }
 
 always_inline u8
@@ -151,7 +151,7 @@ ethernet_vlan_header_get_priority_net_order (ethernet_vlan_header_t * h)
 {
   u8 *bytes = (u8 *) (&h->priority_cfi_and_id);
 
-  return (bytes[0] >> 5);
+  return (bytes[0] >> 4);
 }
 
 /* VLAN with ethertype first and vlan id second */