L2 over MPLS

[support for VPWS/VPLS]
- switch to using dpo_proto_t rather than fib_protocol_t in fib_paths so that we can describe L2 paths
- VLIB nodes to handle pop/push of MPLS labels to L2

Change-Id: Id050d06a11fd2c9c1c81ce5a0654e6c5ae6afa6e
Signed-off-by: Neale Ranns <nranns@cisco.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/vnet/mpls/mpls.api b/src/vnet/mpls/mpls.api
index 67f1045d57a..5973a0a6cbd 100644
--- a/src/vnet/mpls/mpls.api
+++ b/src/vnet/mpls/mpls.api
@@ -156,7 +156,7 @@ manual_endian manual_print define mpls_tunnel_details
     @param mr_is_interface_rx - Interface Receive path
     @param mr_is_interface_rx - RPF-ID Receive path. The next-hop interface
                                 is used as the RPF-ID
-    @param mr_next_hop_proto_is_ip4 - The next-hop is IPV4
+    @param mr_next_hop_proto - The next-hop protocol, of type dpo_proto_t
     @param mr_next_hop_weight - The weight, for UCMP
     @param mr_next_hop[16] - the nextop address
     @param mr_next_hop_sw_if_index - the next-hop SW interface
@@ -182,7 +182,7 @@ autoreply define mpls_route_add_del
   u8 mr_is_resolve_attached;
   u8 mr_is_interface_rx;
   u8 mr_is_rpf_id;
-  u8 mr_next_hop_proto_is_ip4;
+  u8 mr_next_hop_proto;
   u8 mr_next_hop_weight;
   u8 mr_next_hop_preference;
   u8 mr_next_hop[16];