diff options
| author | vivek <vivek@cumulusnetworks.com> | 2015-11-20 08:51:48 -0800 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2015-11-20 08:51:48 -0800 |
| commit | 922705ecdccad98dcb5eb8dcb37394ec339afe51 (patch) | |
| tree | b2db1f62de86768be5edc4658bff5f345282cc89 /zebra/interface.c | |
| parent | 41ec92223a7dfc14eb8cb0b84c73ad09943213eb (diff) | |
| parent | 8afc891ac75f2b1f17d9190ef8de5378ec55fcd5 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Diffstat (limited to 'zebra/interface.c')
| -rw-r--r-- | zebra/interface.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/zebra/interface.c b/zebra/interface.c index 8d081c0597..bd1e404d23 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 (); @@ -478,7 +478,6 @@ if_delete_update (struct interface *ifp) UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL); UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED); - connected_delete_ipv4_unnumbered(ifc); /* Remove from subnet chain. */ list_delete_node (addr_list, anode); @@ -753,7 +752,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 +813,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 +923,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 +1911,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); |