From: Szymon Sliwa <szs@semihalf.com>
Date: Mon, 19 Feb 2018 11:52:16 +0000 (+0100)
Subject: plugins: odp: ipsec: Del GRE as it was not tested
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F10652%2F1;p=odp4vpp.git

plugins: odp: ipsec: Del GRE as it was not tested

In case of trying to add GRE to the IPsec implementation, be careful as the
post_crypto and ipsec fields of the vnet_buffer union overlap, and both are
needed for the ODP based ipsec with GRE.

Change-Id: If20fa9d78f2879264c02922f21bc204fba1ab616
Signed-off-by: Szymon Sliwa <szs@semihalf.com>
---

diff --git a/src/plugins/odp/ipsec/esp_decrypt.c b/src/plugins/odp/ipsec/esp_decrypt.c
index 3e076768..814c52bd 100644
--- a/src/plugins/odp/ipsec/esp_decrypt.c
+++ b/src/plugins/odp/ipsec/esp_decrypt.c
@@ -28,8 +28,7 @@
 #define foreach_esp_decrypt_next                \
 _(DROP, "error-drop")                           \
 _(IP4_INPUT, "ip4-input")                       \
-_(IP6_INPUT, "ip6-input")                       \
-_(IPSEC_GRE_INPUT, "ipsec-gre-input")
+_(IP6_INPUT, "ip6-input")
 
 #define _(v, s) ESP_DECRYPT_NEXT_##v,
 typedef enum
@@ -404,12 +403,6 @@ esp_decrypt_node_fn (vlib_main_t * vm,
 		    }
 		}
 
-	      /* for IPSec-GRE tunnel next node is ipsec-gre-input */
-	      if (PREDICT_FALSE
-		  ((vnet_buffer (b0)->ipsec.flags) &
-		   IPSEC_FLAG_IPSEC_GRE_TUNNEL))
-		next0 = ESP_DECRYPT_NEXT_IPSEC_GRE_INPUT;
-
 	      vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
 
 	      vnet_buffer (b0)->post_crypto.next_index = next0;