summaryrefslogtreecommitdiffstats
path: root/ripngd/ripngd.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2016-12-06 21:10:06 +0100
committerQuentin Young <qlyoung@cumulusnetworks.com>2016-12-06 21:21:36 +0100
commitee9216cf748e9dc29c00084ad3cc705b0aed9b18 (patch)
tree382fce0c6fe2c332d7644a74024b25238e56b37d /ripngd/ripngd.c
parentMerge remote-tracking branch 'osr/master' into vtysh-grammar (diff)
downloadfrr-ee9216cf748e9dc29c00084ad3cc705b0aed9b18.tar.xz
frr-ee9216cf748e9dc29c00084ad3cc705b0aed9b18.zip
lib, ripngd: clean up merge leftovers
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to '')
-rw-r--r--ripngd/ripngd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index efd21b806..afac71814 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -3092,7 +3092,6 @@ ripng_init ()
/* Install ripng commands. */
install_element (VIEW_NODE, &show_ipv6_ripng_cmd);
install_element (VIEW_NODE, &show_ipv6_ripng_status_cmd);
- install_element (VIEW_NODE, &show_ipv6_protocols_cmd);
install_element (ENABLE_NODE, &clear_ipv6_rip_cmd);
@@ -3111,6 +3110,7 @@ ripng_init ()
install_element (RIPNG_NODE, &ripng_timers_cmd);
install_element (RIPNG_NODE, &no_ripng_timers_cmd);
#if 0
+ install_element (VIEW_NODE, &show_ipv6_protocols_cmd);
install_element (RIPNG_NODE, &ripng_update_timer_cmd);
install_element (RIPNG_NODE, &no_ripng_update_timer_cmd);
install_element (RIPNG_NODE, &ripng_timeout_timer_cmd);