diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 20:04:08 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-05 20:04:08 +0100 |
| commit | 7ddcfca4fb5246c5e211f7e37d98a8c9a51b4e70 (patch) | |
| tree | ea8dead406e7963c4b8283477daea4d5224845ac /ripngd/ripng_interface.c | |
| parent | 53dc2b05c76f4f5cd6a72373fb241afdcedb2ee1 (diff) | |
| parent | 54c5dce6a5e46717ad52c80f2dc99fc36a372e28 (diff) | |
Merge branch 'queue/osr/vtysh-generic'
WARNING: Merge contains nontrivial fixups in vrf_cmd handling.
Conflicts:
lib/if.c
zebra/interface.c
Diffstat (limited to 'ripngd/ripng_interface.c')
| -rw-r--r-- | ripngd/ripng_interface.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 6641870300..8505fd4c2c 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -1190,13 +1190,7 @@ ripng_if_init () /* Install interface node. */ install_node (&interface_node, interface_config_write); - - /* Install commands. */ - install_element (CONFIG_NODE, &interface_cmd); - install_element (CONFIG_NODE, &no_interface_cmd); - install_default (INTERFACE_NODE); - install_element (INTERFACE_NODE, &interface_desc_cmd); - install_element (INTERFACE_NODE, &no_interface_desc_cmd); + if_cmd_init (); install_element (RIPNG_NODE, &ripng_network_cmd); install_element (RIPNG_NODE, &no_ripng_network_cmd); |