X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_table_combined.c;h=8bf4aeb0c22e1c4333da7fb54adad56becd20c88;hb=99a5744147ea079828a52ee904ea79ba52602c16;hp=dd09da5e58d8491ddc78e2fe9a719591c0e84e04;hpb=7822c43aba8ce07208a94124a46579fe43c0b103;p=dpdk.git

diff --git a/app/test/test_table_combined.c b/app/test/test_table_combined.c
index dd09da5e58..8bf4aeb0c2 100644
--- a/app/test/test_table_combined.c
+++ b/app/test/test_table_combined.c
@@ -293,9 +293,10 @@ test_table_lpm_combined(void)
 
 	/* Traffic flow */
 	struct rte_table_lpm_params lpm_params = {
+		.name = "LPM",
 		.n_rules = 1 << 16,
 		.entry_unique_size = 8,
-		.offset = 0,
+		.offset = APP_METADATA_OFFSET(0),
 	};
 
 	struct rte_table_lpm_key lpm_key = {
@@ -352,10 +353,11 @@ test_table_lpm_ipv6_combined(void)
 
 	/* Traffic flow */
 	struct rte_table_lpm_ipv6_params lpm_ipv6_params = {
+		.name = "LPM",
 		.n_rules = 1 << 16,
 		.number_tbl8s = 1 << 13,
 		.entry_unique_size = 8,
-		.offset = 32,
+		.offset = APP_METADATA_OFFSET(32),
 	};
 
 	struct rte_table_lpm_ipv6_key lpm_ipv6_key = {
@@ -416,9 +418,9 @@ test_table_hash8lru(void)
 	struct rte_table_hash_key8_lru_params key8lru_params = {
 		.n_entries = 1<<24,
 		.f_hash = pipeline_test_hash,
-		.seed = 0,
-		.signature_offset = 0,
-		.key_offset = 32,
+		.signature_offset = APP_METADATA_OFFSET(0),
+		.key_offset = APP_METADATA_OFFSET(32),
+		.key_mask = NULL,
 	};
 
 	uint8_t key8lru[8];
@@ -475,8 +477,9 @@ test_table_hash16lru(void)
 		.n_entries = 1<<16,
 		.f_hash = pipeline_test_hash,
 		.seed = 0,
-		.signature_offset = 0,
-		.key_offset = 32,
+		.signature_offset = APP_METADATA_OFFSET(0),
+		.key_offset = APP_METADATA_OFFSET(32),
+		.key_mask = NULL,
 	};
 
 	uint8_t key16lru[16];
@@ -533,8 +536,8 @@ test_table_hash32lru(void)
 		.n_entries = 1<<16,
 		.f_hash = pipeline_test_hash,
 		.seed = 0,
-		.signature_offset = 0,
-		.key_offset = 32,
+		.signature_offset = APP_METADATA_OFFSET(0),
+		.key_offset = APP_METADATA_OFFSET(32),
 	};
 
 	uint8_t key32lru[32];
@@ -592,8 +595,9 @@ test_table_hash8ext(void)
 		.n_entries_ext = 1<<15,
 		.f_hash = pipeline_test_hash,
 		.seed = 0,
-		.signature_offset = 0,
-		.key_offset = 32,
+		.signature_offset = APP_METADATA_OFFSET(0),
+		.key_offset = APP_METADATA_OFFSET(32),
+		.key_mask = NULL,
 	};
 
 	uint8_t key8ext[8];
@@ -658,8 +662,9 @@ test_table_hash16ext(void)
 		.n_entries_ext = 1<<15,
 		.f_hash = pipeline_test_hash,
 		.seed = 0,
-		.signature_offset = 0,
-		.key_offset = 32,
+		.signature_offset = APP_METADATA_OFFSET(0),
+		.key_offset = APP_METADATA_OFFSET(32),
+		.key_mask = NULL,
 	};
 
 	uint8_t key16ext[16];
@@ -724,8 +729,8 @@ test_table_hash32ext(void)
 		.n_entries_ext = 1<<15,
 		.f_hash = pipeline_test_hash,
 		.seed = 0,
-		.signature_offset = 0,
-		.key_offset = 32,
+		.signature_offset = APP_METADATA_OFFSET(0),
+		.key_offset = APP_METADATA_OFFSET(32),
 	};
 
 	uint8_t key32ext[32];