From: Michal Kobylinski <michalx.kobylinski@intel.com>
Date: Thu, 17 Mar 2016 08:47:25 +0000 (+0100)
Subject: lpm: fix pipeline apps
X-Git-Tag: spdx-start~7251
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=53efd8ecad2e98e727c19e4b2996a5f9d232f262;p=dpdk.git

lpm: fix pipeline apps

Updated ip_pipeline app is using new changes from LPM library
(Increased number of next hops and added new config structure
for LPM IPv4).

Fixes: f1f7261838b3 ("lpm: add a new config structure for IPv4")

Signed-off-by: Michal Kobylinski <michalx.kobylinski@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---

diff --git a/app/test-pipeline/pipeline_lpm.c b/app/test-pipeline/pipeline_lpm.c
index 916abd42b6..ecea6b3b80 100644
--- a/app/test-pipeline/pipeline_lpm.c
+++ b/app/test-pipeline/pipeline_lpm.c
@@ -47,6 +47,10 @@
 
 #include "main.h"
 
+#ifndef PIPELINE_LPM_TABLE_NUMBER_TABLE8s
+#define PIPELINE_LPM_TABLE_NUMBER_TABLE8s 256
+#endif
+
 void
 app_main_loop_worker_pipeline_lpm(void) {
 	struct rte_pipeline_params pipeline_params = {
@@ -113,6 +117,8 @@ app_main_loop_worker_pipeline_lpm(void) {
 		struct rte_table_lpm_params table_lpm_params = {
 			.name = "LPM",
 			.n_rules = 1 << 24,
+			.number_tbl8s = PIPELINE_LPM_TABLE_NUMBER_TABLE8s,
+			.flags = 0,
 			.entry_unique_size =
 				sizeof(struct rte_pipeline_table_entry),
 			.offset = APP_METADATA_OFFSET(32),
diff --git a/examples/ip_pipeline/pipeline/pipeline_routing_be.c b/examples/ip_pipeline/pipeline/pipeline_routing_be.c
index 8342b7b7dd..431c63656b 100644
--- a/examples/ip_pipeline/pipeline/pipeline_routing_be.c
+++ b/examples/ip_pipeline/pipeline/pipeline_routing_be.c
@@ -67,6 +67,10 @@
 
 #define MAC_SRC_DEFAULT 0x112233445566
 
+#ifndef PIPELINE_ROUTING_LPM_TABLE_NUMBER_TABLE8s
+#define PIPELINE_ROUTING_LPM_TABLE_NUMBER_TABLE8s 256
+#endif
+
 struct pipeline_routing {
 	struct pipeline p;
 	struct pipeline_routing_params params;
@@ -1284,6 +1288,8 @@ pipeline_routing_init(struct pipeline_params *params,
 		struct rte_table_lpm_params table_lpm_params = {
 			.name = p->name,
 			.n_rules = p_rt->params.n_routes,
+			.number_tbl8s = PIPELINE_ROUTING_LPM_TABLE_NUMBER_TABLE8s,
+			.flags = 0,
 			.entry_unique_size = sizeof(struct routing_table_entry),
 			.offset = p_rt->params.ip_hdr_offset +
 				__builtin_offsetof(struct ipv4_hdr, dst_addr),