1 files changed, 0 insertions, 78 deletions
diff --git a/vnet/vnet/mpls/mpls.h b/vnet/vnet/mpls/mpls.h
index 59fc761ea2c..b6fdbce7d70 100644
--- a/vnet/vnet/mpls/mpls.h
+++ b/vnet/vnet/mpls/mpls.h
@@ -30,30 +30,6 @@ typedef enum {
   MPLS_N_ERROR,
 } mpls_error_t;
 
-/*
- * No protocol info, MPLS labels don't have a next-header field
- * presumably the label field tells all...
- */
-typedef struct {
-  u8 tunnel_dst[6];
-  ip4_address_t intfc_address;
-  u32 tx_sw_if_index;
-  u32 inner_fib_index;
-  u32 mask_width;
-  u32 encap_index;
-  u32 hw_if_index;
-  u8 * rewrite_data;
-  u8 l2_only;
-  fib_node_index_t fei;
-} mpls_eth_tunnel_t;
-
-typedef struct {
-  mpls_unicast_header_t *labels;
-  /* only for policy tunnels */
-  u8 * rewrite;
-  u32 output_next_index;
-} mpls_encap_t;
-
 #define MPLS_FIB_DEFAULT_TABLE_ID 0
 
 /**
@@ -94,18 +70,6 @@ typedef struct {
   /** A hash table to lookup the mpls_fib by table ID */
   uword *fib_index_by_table_id;
 
-  /* pool of ethernet tunnel instances */
-  mpls_eth_tunnel_t *eth_tunnels;
-  u32 * free_eth_sw_if_indices;
-
-  /* Encap side: map (fib, dst_address) to mpls label stack */
-  mpls_encap_t * encaps;
-  uword * mpls_encap_by_fib_and_dest;
-
-  /* mpls-o-e policy tunnel next index for ip4/ip6-classify */
-  u32 ip4_classify_mpls_policy_encap_next_index;
-  u32 ip6_classify_mpls_policy_encap_next_index;
-
   /* Feature arc indices */
   u8 input_feature_arc_index;
   u8 output_feature_arc_index;
@@ -123,7 +87,6 @@ extern mpls_main_t mpls_main;
 extern clib_error_t * mpls_feature_init(vlib_main_t * vm);
 
 format_function_t format_mpls_protocol;
-format_function_t format_mpls_eth_header_with_length;
 format_function_t format_mpls_encap_index;
 
 format_function_t format_mpls_eos_bit;
@@ -153,29 +116,8 @@ void mpls_sw_interface_enable_disable (mpls_main_t * mm,
 
 u8 mpls_sw_interface_is_enabled (u32 sw_if_index);
 
-mpls_encap_t *
-mpls_encap_by_fib_and_dest (mpls_main_t * mm, u32 rx_fib, u32 dst_address);
-
-int vnet_mpls_ethernet_add_del_tunnel (u8 *dst,
-                                       ip4_address_t *intfc,
-                                       u32 mask_width,
-                                       u32 inner_fib_id,
-                                       u32 tx_sw_if_index,
-                                       u32 * tunnel_sw_if_index,
-                                       u8 l2_only,
-                                       u8 is_add);
-
 int mpls_fib_reset_labels (u32 fib_id);
 
-int vnet_mpls_add_del_encap (ip4_address_t *dest, u32 fib_id,
-                             u32 *labels_host_byte_order,
-                             u32 policy_tunnel_index,
-                             int no_dst_hash, u32 * indexp, int is_add);
-
-int vnet_mpls_policy_tunnel_add_rewrite (mpls_main_t * mm,
-                                         mpls_encap_t * e,
-                                         u32 policy_tunnel_index);
-
 #define foreach_mpls_input_next			\
 _(DROP, "error-drop")                           \
 _(LOOKUP, "mpls-lookup")
@@ -211,26 +153,6 @@ typedef enum {
 } mpls_output_next_t;
 
 typedef struct {
-  u32 lookup_miss;
-
-  /* Tunnel-id / index in tunnel vector */
-  u32 tunnel_id;
-
-  /* output interface */
-  u32 tx_sw_if_index;
-
-  /* mpls encap index */
-  u32 mpls_encap_index;
-
-  /* pkt length */
-  u32 length;
-
-  u8 dst[6];
-} mpls_eth_tx_trace_t;
-
-u8 * format_mpls_eth_tx_trace (u8 * s, va_list * args);
-
-typedef struct {
   u32 fib_index;
   u32 entry_index;
   u32 dest;