From: vivek <vivek@cumulusnetworks.com>
Date: Mon, 23 May 2016 16:46:14 +0000 (-0700)
Subject: zebra: Ensure IPv6 RA configuration is displayed correctly
X-Git-Tag: frr-2.0-rc1~887
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c5b37afc6bb4bccf170a9dd89ea80615375e1b66;p=mirror%2Ffrr.git

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 <vivek@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-11076
Reviewed By: CCR-4770
Testing Done: Manual; also verified by defect submitter.
---

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;