From: Don Slice <dslice@cumulusnetworks.com>
Date: Thu, 4 Jun 2020 15:23:09 +0000 (+0000)
Subject: zebra: fix deletion of evpn mh neigh-holdtime
X-Git-Tag: frr-7.5~11^2~35
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a6856a4b9c94ef57593f847188b4dcf676e077e2;p=matthieu%2Ffrr.git

zebra: fix deletion of evpn mh neigh-holdtime

Found that the command "evpn mh neigh-holdtime" can be set but
not deleted.  This fix solves the delete process

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
---

diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
index 3c99ce29c3..779d27306d 100644
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@ -2099,7 +2099,7 @@ int zebra_evpn_mh_neigh_holdtime_update(struct vty *vty,
 		uint32_t duration, bool set_default)
 {
 	if (set_default)
-		zmh_info->neigh_hold_time = EVPN_MH_NEIGH_HOLD_TIME_DEF;
+		duration = EVPN_MH_NEIGH_HOLD_TIME_DEF;
 
 	zmh_info->neigh_hold_time = duration;