X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Flisp-gpe%2Finterface.c;h=d2664a49e4092e090a5081e5408f74a2c140fd76;hb=6085e16d924f12d57779d7d7692016ec9fc19a9d;hp=d12dc362dacda9ba20a87505566e4445750351cc;hpb=7bc731047d87bffa51581e3d08e21410858d2010;p=vpp.git

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);
 }