X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_forward.c;h=275bcc67b69b987ec9333f0b4f02dab52bc89e94;hb=3a0325f9cab7838c21b19698b89cfc65e3236085;hp=f4c51e22bfc9382c4d5582b61ab58a7c44628cfc;hpb=61f7912466098773f789bd3ce57431e5dcff8978;p=vpp.git

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index f4c51e22bfc..275bcc67b69 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -1213,23 +1213,15 @@ ip6_local_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 			? IP6_ERROR_SRC_LOOKUP_MISS : error1);
 	    }
 
-	  /* TODO maybe move to lookup? */
 	  vnet_buffer (p0)->ip.fib_index =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-	  vnet_buffer (p0)->ip.fib_index =
-	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? vnet_buffer (p0)->ip.
-	    fib_index : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+	    vnet_buffer (p0)->sw_if_index[VLIB_TX] != ~0 ?
+	    vnet_buffer (p0)->sw_if_index[VLIB_TX] :
+	    vnet_buffer (p0)->ip.fib_index;
 
 	  vnet_buffer (p1)->ip.fib_index =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-	  vnet_buffer (p1)->ip.fib_index =
-	    (vnet_buffer (p1)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? vnet_buffer (p1)->ip.
-	    fib_index : vnet_buffer (p1)->sw_if_index[VLIB_TX];
-
+	    vnet_buffer (p1)->sw_if_index[VLIB_TX] != ~0 ?
+	    vnet_buffer (p1)->sw_if_index[VLIB_TX] :
+	    vnet_buffer (p1)->ip.fib_index;
 
 	skip_checks:
 
@@ -1343,14 +1335,10 @@ ip6_local_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      error0 = (!ip6_urpf_loose_check (im, p0, ip0)
 			? IP6_ERROR_SRC_LOOKUP_MISS : error0);
 	    }
-
-	  vnet_buffer (p0)->ip.fib_index =
-	    vec_elt (im->fib_index_by_sw_if_index,
-		     vnet_buffer (p0)->sw_if_index[VLIB_RX]);
 	  vnet_buffer (p0)->ip.fib_index =
-	    (vnet_buffer (p0)->sw_if_index[VLIB_TX] ==
-	     (u32) ~ 0) ? vnet_buffer (p0)->ip.
-	    fib_index : vnet_buffer (p0)->sw_if_index[VLIB_TX];
+	    vnet_buffer (p0)->sw_if_index[VLIB_TX] != ~0 ?
+	    vnet_buffer (p0)->sw_if_index[VLIB_TX] :
+	    vnet_buffer (p0)->ip.fib_index;
 
 	skip_check: