X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-crypto-perf%2Fcperf_options.h;h=09caefde22981dfd11d0330417e84d64fd81cf57;hb=3dea1b2693ab8b46f5add0642b08714884634bae;hp=1ed0a77e54ae6627050ac27cc7014f654ed36351;hpb=8fd2b5a60d1cd0c7bc608452d6fd8c13f8761f1d;p=dpdk.git

diff --git a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h
index 1ed0a77e54..09caefde22 100644
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -7,11 +7,12 @@
 
 #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_POOL_SIZE		("pool-sz")
@@ -47,9 +48,12 @@
 
 #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")
+#define PDCP_DEFAULT_HFN	0x1
+#define CPERF_DOCSIS_HDR_SZ	("docsis-hdr-sz")
 #endif
 
 #define CPERF_CSV		("csv-friendly")
@@ -75,7 +79,10 @@ enum cperf_op_type {
 	CPERF_CIPHER_THEN_AUTH,
 	CPERF_AUTH_THEN_CIPHER,
 	CPERF_AEAD,
-	CPERF_PDCP
+	CPERF_PDCP,
+	CPERF_DOCSIS,
+	CPERF_IPSEC,
+	CPERF_ASYM_MODEX
 };
 
 extern const char *cperf_op_type_strs[];
@@ -119,9 +126,11 @@ 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;
 	enum rte_security_pdcp_domain pdcp_domain;
+	uint16_t docsis_hdr_sz;
 #endif
 	char device_type[RTE_CRYPTODEV_NAME_MAX_LEN];
 	enum cperf_op_type op_type;
@@ -145,6 +154,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