summaryrefslogtreecommitdiff
path: root/zebra/interface.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-06-13 09:18:14 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-06-13 09:18:14 +0200
commit97bd5c48de49f1a25c6fb979f0ca151412fbd61b (patch)
tree924b30812e7ae8d9d2f7c897b4ebbbf19802eff8 /zebra/interface.c
parentcea34723daeb767a5b92fa5800ebed81e3f690b6 (diff)
parentad2e2470f63e3fac228b6cc532dfe36a0794a846 (diff)
Merge remote-tracking branch 'frr/master' into pull-624
Diffstat (limited to 'zebra/interface.c')
-rw-r--r--zebra/interface.c2
1 files changed, 2 insertions, 0 deletions
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);