From c5b37afc6bb4bccf170a9dd89ea80615375e1b66 Mon Sep 17 00:00:00 2001 From: vivek Date: Mon, 23 May 2016 09:46:14 -0700 Subject: [PATCH] zebra: Ensure IPv6 RA configuration is displayed correctly IPv6 RAs on an interface can be enabled either by the operator or internally due to the configuration of a BGP unnumbered neighbor. Ensure that this is displayed in the configuration correctly. Signed-off-by: Vivek Venkatraman Reviewed-by: Donald Sharp Ticket: CM-11076 Reviewed By: CCR-4770 Testing Done: Manual; also verified by defect submitter. --- zebra/rtadv.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 59542481dd..72ae21657f 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -1884,16 +1884,8 @@ rtadv_config_write (struct vty *vty, struct interface *ifp) if (!(if_is_loopback (ifp) || CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK))) { - if (ipv6_address_configured(ifp)) - { - if (! zif->rtadv.AdvSendAdvertisements) - vty_out (vty, " ipv6 nd suppress-ra%s", VTY_NEWLINE); - } - else - { - if (zif->rtadv.AdvSendAdvertisements) - vty_out (vty, " no ipv6 nd suppress-ra%s", VTY_NEWLINE); - } + if (zif->rtadv.AdvSendAdvertisements) + vty_out (vty, " no ipv6 nd suppress-ra%s", VTY_NEWLINE); } interval = zif->rtadv.MaxRtrAdvInterval; -- 2.39.5