summaryrefslogtreecommitdiff
path: root/pimd/pim_vty.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-03-07 16:09:30 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2017-03-07 16:09:30 +0100
commit8f0e091b3c95c31de764435d8d3009f21ebbee87 (patch)
tree456faf5478b275cb523993038e9e3b2d5231a276 /pimd/pim_vty.c
parentf6e250f8509747317fb526a719ba60627f4f7b10 (diff)
parent344cbf76bc3c91493e90cdc9f82345fc46ef72ed (diff)
Merge branch 'frr/pull/246' ("Pim command cleanup")
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_vty.c')
-rw-r--r--pimd/pim_vty.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 03ee7e92ec..5b6a79b95a 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -148,11 +148,6 @@ int pim_global_config_write(struct vty *vty)
writes += pim_msdp_config_write (vty);
- if (PIM_MROUTE_IS_ENABLED) {
- vty_out(vty, "ip multicast-routing%s", VTY_NEWLINE);
- ++writes;
- }
-
writes += pim_rp_config_write (vty);
if (qpim_register_suppress_time != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT)