From 6085e16d924f12d57779d7d7692016ec9fc19a9d Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Wed, 15 Feb 2017 14:16:26 -0800 Subject: [PATCH] Fix NSH-LISP interface addition Change-Id: I3925d2ebb2d26c676fc61f118d25bdf7fd522f26 Signed-off-by: Florin Coras --- src/vnet/lisp-gpe/interface.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/vnet/lisp-gpe/interface.c b/src/vnet/lisp-gpe/interface.c index d12dc362dac..d2664a49e40 100644 --- a/src/vnet/lisp-gpe/interface.c +++ b/src/vnet/lisp-gpe/interface.c @@ -833,6 +833,22 @@ lisp_gpe_add_del_iface_command_fn (vlib_main_t * vm, unformat_input_t * input, } } + if (nsh_iface) + { + if (is_add) + { + if (~0 == lisp_gpe_add_nsh_iface (&lisp_gpe_main)) + { + return clib_error_return (0, "NSH interface not created"); + } + } + else + { + lisp_gpe_del_nsh_iface (&lisp_gpe_main); + } + return (NULL); + } + if (vrf_is_set && bd_index_is_set) return clib_error_return (0, "Cannot set both vrf and brdige domain index!"); @@ -864,21 +880,6 @@ lisp_gpe_add_del_iface_command_fn (vlib_main_t * vm, unformat_input_t * input, lisp_gpe_tenant_l3_iface_unlock (vni); } - if (nsh_iface) - { - if (is_add) - { - if (~0 == lisp_gpe_add_nsh_iface (&lisp_gpe_main)) - { - return clib_error_return (0, "NSH interface not created"); - } - else - { - lisp_gpe_del_nsh_iface (&lisp_gpe_main); - } - } - } - return (NULL); } -- 2.16.6