X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_if_in.c;h=2627e7c1ca61941f49de898fe1313cd11c0c9a41;hb=refs%2Fchanges%2F38%2F9538%2F5;hp=861d27c1233b371757683a62cac960492be93f3d;hpb=01034be6738b9bd072a3d3cfdeb1b900aac2b54f;p=vpp.git

diff --git a/src/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c
index 861d27c1233..2627e7c1ca6 100644
--- a/src/vnet/ipsec/ipsec_if_in.c
+++ b/src/vnet/ipsec/ipsec_if_in.c
@@ -65,7 +65,7 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   ipsec_main_t *im = &ipsec_main;
   vnet_main_t *vnm = im->vnet_main;
   vnet_interface_main_t *vim = &vnm->interface_main;
-  esp_main_t *em = &esp_main;
+  ipsec_proto_main_t *em = &ipsec_proto_main;
   u32 *from, *to_next = 0, next_index;
   u32 n_left_from, last_sw_if_index = ~0;
   u32 thread_index = vlib_get_thread_index ();
@@ -120,6 +120,7 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  vnet_buffer (b0)->ipsec.flags = 0;
 		  hi = vnet_get_hw_interface (vnm, t->hw_if_index);
 		  sw_if_index0 = hi->sw_if_index;
+		  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0;
 
 		  if (PREDICT_TRUE (sw_if_index0 == last_sw_if_index))
 		    {
@@ -129,7 +130,9 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  else
 		    {
 		      sa0 = pool_elt_at_index (im->sad, t->input_sa_index);
-		      icv_len = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+		      icv_len =
+			em->ipsec_proto_main_integ_algs[sa0->
+							integ_alg].trunc_size;
 
 		      /* length = packet length - ESP/tunnel overhead */
 		      n_bytes -= n_packets * (sizeof (ip4_header_t) +
@@ -177,7 +180,7 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   if (last_t)
     {
       sa0 = pool_elt_at_index (im->sad, last_t->input_sa_index);
-      icv_len = em->esp_integ_algs[sa0->integ_alg].trunc_size;
+      icv_len = em->ipsec_proto_main_integ_algs[sa0->integ_alg].trunc_size;
 
       n_bytes -= n_packets * (sizeof (ip4_header_t) + sizeof (esp_header_t) +
 			      sizeof (esp_footer_t) + 16 /* aes-cbc IV */  +