X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmap%2Fip6_map.c;h=136f548db50b0c34e40ddb3f5280ad243d213468;hb=f145c15631ba62e798395499f83a2f8a91ae83c7;hp=96f81efc1cb4d69dce90d89b94f815c3955ddcef;hpb=7b2e9fb1a8f389fa7b88fcbaf3356cbdae254250;p=vpp.git

diff --git a/src/plugins/map/ip6_map.c b/src/plugins/map/ip6_map.c
index 96f81efc1cb..136f548db50 100644
--- a/src/plugins/map/ip6_map.c
+++ b/src/plugins/map/ip6_map.c
@@ -155,20 +155,6 @@ ip6_map_security_check (map_domain_t * d, vlib_buffer_t * b0,
     }
 }
 
-static_always_inline bool
-ip6_map_ip4_lookup_bypass (vlib_buffer_t * p0, ip4_header_t * ip)
-{
-#ifdef MAP_SKIP_IP6_LOOKUP
-  if (FIB_NODE_INDEX_INVALID != pre_resolved[FIB_PROTOCOL_IP4].fei)
-    {
-      vnet_buffer (p0)->ip.adj_index[VLIB_TX] =
-	pre_resolved[FIB_PROTOCOL_IP4].dpo.dpoi_index;
-      return (true);
-    }
-#endif
-  return (false);
-}
-
 /*
  * ip6_map
  */
@@ -314,7 +300,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 		    {
 		      vnet_buffer (p0)->ip_frag.flags = 0;
 		      vnet_buffer (p0)->ip_frag.next_index =
-			IP4_FRAG_NEXT_IP4_LOOKUP;
+			IP_FRAG_NEXT_IP4_LOOKUP;
 		      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
 		      next0 = IP6_MAP_NEXT_IP4_FRAGMENT;
 		    }
@@ -346,7 +332,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 		    {
 		      vnet_buffer (p1)->ip_frag.flags = 0;
 		      vnet_buffer (p1)->ip_frag.next_index =
-			IP4_FRAG_NEXT_IP4_LOOKUP;
+			IP_FRAG_NEXT_IP4_LOOKUP;
 		      vnet_buffer (p1)->ip_frag.mtu = d1->mtu;
 		      next1 = IP6_MAP_NEXT_IP4_FRAGMENT;
 		    }
@@ -497,7 +483,7 @@ ip6_map (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 		    {
 		      vnet_buffer (p0)->ip_frag.flags = 0;
 		      vnet_buffer (p0)->ip_frag.next_index =
-			IP4_FRAG_NEXT_IP4_LOOKUP;
+			IP_FRAG_NEXT_IP4_LOOKUP;
 		      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
 		      next0 = IP6_MAP_NEXT_IP4_FRAGMENT;
 		    }
@@ -618,11 +604,11 @@ ip6_map_post_ip4_reass (vlib_main_t * vm,
 	      MAP_ERROR_DECAP_SEC_CHECK;
 
 	  if (PREDICT_FALSE
-	      (d0->mtu && (clib_host_to_net_u16 (ip40->length) > d0->mtu)
-	       && error0 == MAP_ERROR_NONE))
+	      (error0 == MAP_ERROR_NONE &&
+	       d0->mtu && (clib_host_to_net_u16 (ip40->length) > d0->mtu)))
 	    {
 	      vnet_buffer (p0)->ip_frag.flags = 0;
-	      vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP;
+	      vnet_buffer (p0)->ip_frag.next_index = IP_FRAG_NEXT_IP4_LOOKUP;
 	      vnet_buffer (p0)->ip_frag.mtu = d0->mtu;
 	      next0 = IP6_MAP_POST_IP4_REASS_NEXT_IP4_FRAGMENT;
 	    }