From 0a796ae9932c8b827329ffe1ba10433c49c2c2e4 Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Fri, 26 May 2017 03:48:53 -0700
Subject: MPLS lookup DPO does not pop the label (nor does it handle replicate)

Change-Id: I7de6b96631d1645d0eadd38525860d84d78e316d
Signed-off-by: Neale Ranns <nranns@cisco.com>
---
 src/vnet/mpls/mpls_lookup.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/vnet/mpls/mpls_lookup.c')

diff --git a/src/vnet/mpls/mpls_lookup.c b/src/vnet/mpls/mpls_lookup.c
index 4424f62cff5..5dd6980c727 100644
--- a/src/vnet/mpls/mpls_lookup.c
+++ b/src/vnet/mpls/mpls_lookup.c
@@ -17,12 +17,20 @@
 
 #include <vlib/vlib.h>
 #include <vnet/pg/pg.h>
-#include <vnet/mpls/mpls.h>
+#include <vnet/mpls/mpls_lookup.h>
 #include <vnet/fib/mpls_fib.h>
 #include <vnet/dpo/load_balance.h>
 
+
+/**
+ * Static MPLS VLIB forwarding node
+ */
 vlib_node_registration_t mpls_lookup_node;
 
+/**
+ * The arc/edge from the MPLS lookup node to the MPLS replicate node
+ */
+
 typedef struct {
   u32 next_index;
   u32 lb_index;
@@ -47,18 +55,6 @@ format_mpls_lookup_trace (u8 * s, va_list * args)
   return s;
 }
 
-/*
- * Compute flow hash. 
- * We'll use it to select which adjacency to use for this flow.  And other things.
- */
-always_inline u32
-mpls_compute_flow_hash (const mpls_unicast_header_t * hdr,
-                        flow_hash_config_t flow_hash_config)
-{
-    // FIXME
-    return (vnet_mpls_uc_get_label(hdr->label_exp_s_ttl));
-}
-
 static inline uword
 mpls_lookup (vlib_main_t * vm,
              vlib_node_runtime_t * node,
-- 
cgit 1.2.3-korg