diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-11-20 08:33:30 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-11-20 07:07:41 -0800 |
| commit | 8da4e9466a3a3cdbfbc36e92528a9c8f395b230c (patch) | |
| tree | f03c0afa4a8c106779fb3f52ca98dd8572bb38d3 /zebra/interface.c | |
| parent | b78a42c24d119356e231052a526bf7e05d0d0c9f (diff) | |
Quagga: Cleanup RTADV define
The RTADV define was not being set correctly or consistently.
Make the code consistent with our HAVE_IPV6 define.
If the user wants to explicitly turn it off then they should
run --disable-rtadv from the configure cli
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index a3d297d327..884dfedd9e 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -48,11 +48,11 @@ #define ZEBRA_PTM_SUPPORT -#ifdef RTADV +#if defined (HAVE_RTADV) /* Order is intentional. Matches RFC4191. This array is also used for command matching, so only modify with care. */ const char *rtadv_pref_strs[] = { "medium", "high", "INVALID", "low", 0 }; -#endif /* RTADV */ +#endif /* HAVE_RTADV */ /* Called when new interface is added. */ static int @@ -66,7 +66,7 @@ if_zebra_new_hook (struct interface *ifp) zebra_if->shutdown = IF_ZEBRA_SHUTDOWN_OFF; ifp->ptm_enable = zebra_ptm_get_enable_state(); -#ifdef RTADV +#if defined (HAVE_RTADV) { /* Set default router advertise values. */ struct rtadvconf *rtadv; @@ -92,7 +92,7 @@ if_zebra_new_hook (struct interface *ifp) rtadv->AdvPrefixList = list_new (); } -#endif /* RTADV */ +#endif /* HAVE_RTADV */ /* Initialize installed address chains tree. */ zebra_if->ipv4_subnets = route_table_init (); @@ -753,7 +753,7 @@ nbr_connected_dump_vty (struct vty *vty, struct nbr_connected *connected) vty_out (vty, "%s", VTY_NEWLINE); } -#ifdef RTADV +#if defined (HAVE_RTADV) /* Dump interface ND information to vty. */ static void nd_dump_vty (struct vty *vty, struct interface *ifp) @@ -814,7 +814,7 @@ nd_dump_vty (struct vty *vty, struct interface *ifp) VTY_NEWLINE); } } -#endif /* RTADV */ +#endif /* HAVE_RTADV */ /* Interface's information print out to vty interface. */ static void @@ -924,9 +924,9 @@ if_dump_vty (struct vty *vty, struct interface *ifp) connected_dump_vty (vty, connected); } -#ifdef RTADV +#if defined (HAVE_RTADV) nd_dump_vty (vty, ifp); -#endif /* RTADV */ +#endif /* HAVE_RTADV */ if (listhead(ifp->nbr_connected)) vty_out (vty, " Neighbor address(s):%s", VTY_NEWLINE); for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node, nbr_connected)) @@ -1912,9 +1912,9 @@ if_config_write (struct vty *vty) VTY_NEWLINE); } -#ifdef RTADV +#if defined (HAVE_RTADV) rtadv_config_write (vty, ifp); -#endif /* RTADV */ +#endif /* HAVE_RTADV */ #ifdef HAVE_IRDP irdp_config_write (vty, ifp); |