diff options
| author |   Neale Ranns <nranns@cisco.com> | 2016-11-02 14:20:04 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-12-02 11:09:36 +0000 |
| commit | ad422ed7eaafe993d5b530395cb11a708f2ed922 (patch) | |
| tree | 6122391863894f619d13037581f8365ca3796f8f /vnet/vnet/ip/ip6_neighbor.c | |
| parent | caffe0980adc852e6f6afaa2723bd5dd14658de3 (diff) | |
MPLS infrastructure improvments
- deprecate MPLSoEth and MPLSoGRE; replace with generic MPLS tunnel.
- deprecates CLI 'mpls encap ..'; replace with addition of MPLS out label to a route/tunnel.
- support for MPLS 'routes', e.g. MPLS x-connects.
- deprecates CLI 'mpls decap ..'; replace with 'mpls route .. '
Change-Id: Ibda46544912f880d0200f22bf9ff9b52828fcc2f
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/ip6_neighbor.c')
| -rw-r--r-- | vnet/vnet/ip/ip6_neighbor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vnet/vnet/ip/ip6_neighbor.c b/vnet/vnet/ip/ip6_neighbor.c index cc176306969..a407978b3fa 100644 --- a/vnet/vnet/ip/ip6_neighbor.c +++ b/vnet/vnet/ip/ip6_neighbor.c @@ -586,7 +586,7 @@ vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm, n->key.sw_if_index, ~0, 1, - MPLS_LABEL_INVALID, + NULL, // no label stack FIB_ROUTE_PATH_FLAG_NONE); } else |