From: Renato Westphal <renato@opensourcerouting.org>
Date: Tue, 25 Jul 2017 00:39:55 +0000 (-0300)
Subject: ldpd: restore correct defaults on "no discovery ... interval"
X-Git-Tag: frr-4.0-dev~479^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cd49efdac87a4373c78adeb5170ca5298b6c8385;p=matthieu%2Ffrr.git

ldpd: restore correct defaults on "no discovery ... interval"

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
index 09eb6a7c55..2dbc5757d3 100644
--- a/ldpd/ldp_vty_conf.c
+++ b/ldpd/ldp_vty_conf.c
@@ -582,11 +582,12 @@ ldp_vty_disc_interval(struct vty *vty, int disable, const char *hello_type_str,
 		if (disable) {
 			switch (hello_type) {
 			case HELLO_LINK:
-				vty_conf->lhello_interval = LINK_DFLT_HOLDTIME;
+				vty_conf->lhello_interval =
+				    DEFAULT_HELLO_INTERVAL;
 				break;
 			case HELLO_TARGETED:
 				vty_conf->thello_interval =
-				    TARGETED_DFLT_HOLDTIME;
+				    DEFAULT_HELLO_INTERVAL;
 				break;
 			}
 		} else {