[cmaster-next] [PATCH 1/2] ospfd: "ip ospf bfd" removes the "ip ospf bfd 3 250 250" command

[Donald Sharp]

From: Daniel Walton <dwalton at cumulusnetworks.com>

Signed-off-by: Daniel Walton <dwalton at cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd at cumulusnetworks.com>

Ticket: CM-13712
(cherry picked from commit 367b138748e894bbfaae36d1cf7c90eafebfebc9)
---
 ospfd/ospf_bfd.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ospfd/ospf_bfd.c b/ospfd/ospf_bfd.c
index c87bcb0..9ad8508 100644
--- a/ospfd/ospf_bfd.c
+++ b/ospfd/ospf_bfd.c
@@ -369,10 +369,16 @@ DEFUN (ip_ospf_bfd,
        "Enables BFD support\n")
 {
   struct interface *ifp = (struct interface *) vty->index;
+  struct ospf_if_params *params;
+  struct bfd_info *bfd_info;
 
   assert (ifp);
-  ospf_bfd_if_param_set (ifp, BFD_DEF_MIN_RX, BFD_DEF_MIN_TX,
-                         BFD_DEF_DETECT_MULT, 1);
+  params = IF_DEF_PARAMS (ifp);
+  bfd_info = params->bfd_info;
+
+  if (!bfd_info || ! CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
+    ospf_bfd_if_param_set (ifp, BFD_DEF_MIN_RX, BFD_DEF_MIN_TX,
+                           BFD_DEF_DETECT_MULT, 1);
 
   return CMD_SUCCESS;
 }
-- 
2.5.5