X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest-crypto-perf%2Fcperf_options.h;h=613d6d31e2df5c4aeda1e07b5e5f33094d0108ac;hb=7767b849ab028db51474dcbd2a51bff3b5f4f81d;hp=256fabb072a62031999121c7dec11679758ecbac;hpb=5a61bdb9444763a7f6bcb2f6eb1229b0a601d20b;p=dpdk.git

diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h
index 256fabb072..613d6d31e2 100644
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -7,12 +7,14 @@
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 #include <rte_security.h>
 #endif
 
 #define CPERF_PTEST_TYPE	("ptest")
+#define CPERF_MODEX_LEN		("modex-len")
 #define CPERF_SILENT		("silent")
+#define CPERF_ENABLE_SDAP	("enable-sdap")
 
 #define CPERF_POOL_SIZE		("pool-sz")
 #define CPERF_TOTAL_OPS		("total-ops")
@@ -47,7 +49,7 @@
 
 #define CPERF_DIGEST_SZ		("digest-sz")
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 #define CPERF_PDCP_SN_SZ	("pdcp-sn-sz")
 #define CPERF_PDCP_DOMAIN	("pdcp-domain")
 #define CPERF_PDCP_SES_HFN_EN	("pdcp-ses-hfn-en")
@@ -79,7 +81,9 @@ enum cperf_op_type {
 	CPERF_AUTH_THEN_CIPHER,
 	CPERF_AEAD,
 	CPERF_PDCP,
-	CPERF_DOCSIS
+	CPERF_DOCSIS,
+	CPERF_IPSEC,
+	CPERF_ASYM_MODEX
 };
 
 extern const char *cperf_op_type_strs[];
@@ -123,9 +127,10 @@ struct cperf_options {
 
 	uint16_t digest_sz;
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 	uint16_t pdcp_sn_sz;
 	uint16_t pdcp_ses_hfn_en;
+	uint16_t pdcp_sdap;
 	enum rte_security_pdcp_domain pdcp_domain;
 	uint16_t docsis_hdr_sz;
 #endif
@@ -151,6 +156,8 @@ struct cperf_options {
 	uint32_t pmdcc_delay;
 	uint32_t imix_distribution_list[MAX_LIST];
 	uint8_t imix_distribution_count;
+	struct cperf_modex_test_data *modex_data;
+	uint16_t modex_len;
 };
 
 void