X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fhandoff.h;h=f50b86d5c6d0166ec98a241efd5a2ca991419563;hb=ad9d528;hp=815206a9f8c4d58364bd26688f22e62ac3dc1b38;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vnet/handoff.h b/src/vnet/handoff.h
index 815206a9f8c..f50b86d5c6d 100644
--- a/src/vnet/handoff.h
+++ b/src/vnet/handoff.h
@@ -22,17 +22,6 @@
 #include <vnet/ip/ip6_packet.h>
 #include <vnet/mpls/packet.h>
 
-typedef enum
-{
-  HANDOFF_DISPATCH_NEXT_IP4_INPUT,
-  HANDOFF_DISPATCH_NEXT_IP6_INPUT,
-  HANDOFF_DISPATCH_NEXT_MPLS_INPUT,
-  HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT,
-  HANDOFF_DISPATCH_NEXT_DROP,
-  HANDOFF_DISPATCH_N_NEXT,
-} handoff_dispatch_next_t;
-
-
 static inline u64
 ipv4_get_key (ip4_header_t * ip)
 {
@@ -150,7 +139,7 @@ eth_get_sym_key (ethernet_header_t * h0)
 			ip->dst_address.as_u64[0] ^
 			ip->dst_address.as_u64[1] ^ ip->protocol);
     }
-  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS))
     {
       hash_key = mpls_get_key ((mpls_unicast_header_t *) (h0 + 1));
     }
@@ -179,8 +168,7 @@ eth_get_sym_key (ethernet_header_t * h0)
 		   ip->dst_address.as_u64[0] ^
 		   ip->dst_address.as_u64[1] ^ ip->protocol);
 	}
-      else if (outer->type ==
-	       clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+      else if (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS))
 	{
 	  hash_key = mpls_get_key ((mpls_unicast_header_t *) (outer + 1));
 	}
@@ -210,7 +198,7 @@ eth_get_key (ethernet_header_t * h0)
     {
       hash_key = ipv6_get_key ((ip6_header_t *) (h0 + 1));
     }
-  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+  else if (h0->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS))
     {
       hash_key = mpls_get_key ((mpls_unicast_header_t *) (h0 + 1));
     }
@@ -230,8 +218,7 @@ eth_get_key (ethernet_header_t * h0)
 	{
 	  hash_key = ipv6_get_key ((ip6_header_t *) (outer + 1));
 	}
-      else if (outer->type ==
-	       clib_host_to_net_u16 (ETHERNET_TYPE_MPLS_UNICAST))
+      else if (outer->type == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS))
 	{
 	  hash_key = mpls_get_key ((mpls_unicast_header_t *) (outer + 1));
 	}