From: Alex Couloumbis <alex@ozo.com>
Date: Thu, 8 Jun 2017 11:55:25 +0000 (-0400)
Subject: zebra: Fix --disable-rtadv to actually compile
X-Git-Tag: reindent-master-before~83^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F696%2Fhead;p=mirror%2Ffrr.git

zebra: Fix --disable-rtadv to actually compile

Signed-off-by: Alex Couloumbis <alex@ozo.com>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/interface.c b/zebra/interface.c
index c60cb8dcbc..9393305f06 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -849,6 +849,7 @@ if_up (struct interface *ifp)
 
   if_nbr_ipv6ll_to_ipv4ll_neigh_add_all (ifp);
 
+#if defined (HAVE_RTADV)
   /* Enable fast tx of RA if enabled && RA interval is not in msecs */
   if (zif->rtadv.AdvSendAdvertisements &&
       (zif->rtadv.MaxRtrAdvInterval >= 1000))
@@ -856,6 +857,7 @@ if_up (struct interface *ifp)
       zif->rtadv.inFastRexmit = 1;
       zif->rtadv.NumFastReXmitsRemain = RTADV_NUM_FAST_REXMITS;
     }
+#endif
 
   /* Install connected routes to the kernel. */
   if_install_connected (ifp);
diff --git a/zebra/misc_null.c b/zebra/misc_null.c
index b125becdc9..f58eb628b0 100644
--- a/zebra/misc_null.c
+++ b/zebra/misc_null.c
@@ -25,7 +25,9 @@
 #include "zebra/irdp.h"
 #include "zebra/interface.h"
 
+#if defined (HAVE_RTADV)
 void rtadv_config_write (struct vty *vty, struct interface *ifp) { return; }
+#endif
 void irdp_config_write (struct vty *vty, struct interface *ifp) { return; }
 #ifdef HAVE_PROC_NET_DEV
 void ifstat_update_proc (void) { return; }
diff --git a/zebra/zserv.c b/zebra/zserv.c
index ea4c769fa5..9d05a3b9df 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2396,10 +2396,14 @@ zebra_client_read (struct thread *thread)
       zebra_ptm_bfd_client_register(client, sock, length);
       break;
     case ZEBRA_INTERFACE_ENABLE_RADV:
+#if defined (HAVE_RTADV)
       zebra_interface_radv_set (client, sock, length, zvrf, 1);
+#endif
       break;
     case ZEBRA_INTERFACE_DISABLE_RADV:
+#if defined (HAVE_RTADV)
       zebra_interface_radv_set (client, sock, length, zvrf, 0);
+#endif
       break;
     case ZEBRA_MPLS_LABELS_ADD:
     case ZEBRA_MPLS_LABELS_DELETE: