X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp_encrypt.c;h=e80f98624b900c561c8f2bdfb1f1e2ed29dc72a1;hb=fdca4dd1a1a817e65bf44e435261d893fc0c51d6;hp=e9feb8b40a1327a1b96c02b3313a686ea7717a93;hpb=cbe053e14f2852b42e4e3218af8756a6d7e730c8;p=vpp.git

diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index e9feb8b40a1..e80f98624b9 100644
--- a/src/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -695,18 +695,10 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
       if (n_bufs > 1)
 	{
-	  crypto_ops = &ptd->chained_crypto_ops;
-	  integ_ops = &ptd->chained_integ_ops;
-
 	  /* find last buffer in the chain */
 	  while (lb->flags & VLIB_BUFFER_NEXT_PRESENT)
 	    lb = vlib_get_buffer (vm, lb->next_buffer);
 	}
-      else
-	{
-	  crypto_ops = &ptd->crypto_ops;
-	  integ_ops = &ptd->integ_ops;
-	}
 
       if (PREDICT_FALSE (esp_seq_advance (sa0)))
 	{
@@ -879,6 +871,17 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
 	}
 
+      if (lb != b[0])
+	{
+	  crypto_ops = &ptd->chained_crypto_ops;
+	  integ_ops = &ptd->chained_integ_ops;
+	}
+      else
+	{
+	  crypto_ops = &ptd->crypto_ops;
+	  integ_ops = &ptd->integ_ops;
+	}
+
       esp->spi = spi;
       esp->seq = clib_net_to_host_u32 (sa0->seq);