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

diff --git a/src/plugins/map/ip6_map.c b/src/plugins/map/ip6_map.c
index 47958f92a38..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
  */
@@ -618,8 +604,8 @@ 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 = IP_FRAG_NEXT_IP4_LOOKUP;