1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/test_main.c b/zebra/test_main.c
index bbaf450282..828b61af91 100644
--- a/zebra/test_main.c
+++ b/zebra/test_main.c
@@ -124,11 +124,10 @@ DEFUN (test_interface_state,
        "up\n"
        "down\n")
 {
-  struct interface *ifp;
+  VTY_DECLVAR_CONTEXT (interface, ifp);
   if (argc < 1)
     return CMD_WARNING;
-  
-  ifp = vty->index;
+
   if (ifp->ifindex == IFINDEX_INTERNAL)
     {
       ifp->ifindex = ++test_ifindex;
@@ -294,6 +293,7 @@ main (int argc, char **argv)
   /* Vty related initialize. */
   signal_init (zebrad.master, array_size(zebra_signals), zebra_signals);
   cmd_init (1);
+  vty_config_lockless ();
   vty_init (zebrad.master);
   memory_init ();
   zebra_debug_init ();