Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / interface.h

diff --git a/zebra/interface.h b/zebra/interface.h
index d5c1e1713193f22df5a1c23046feed9f26f8170c..b7e90a0c31edcbadbb9afd55f6872698fe606855 100644 (file)
--- a/zebra/interface.h
+++ b/zebra/interface.h
@@ -27,7 +27,7 @@
 #include "hook.h"
 
 #include "zebra/zebra_l2.h"
-#include "zebra/zebra_nhg.h"
+#include "zebra/zebra_nhg_private.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -189,6 +189,13 @@ struct rtadvconf {
         */
        struct list *AdvDNSSLList;
 
+       /*
+        * rfc4861 states RAs must be sent at least 3 seconds apart.
+        * We allow faster retransmits to speed up convergence but can
+        * turn that capability off to meet the rfc if needed.
+        */
+       bool UseFastRexmit; /* True if fast rexmits are enabled */
+
        uint8_t inFastRexmit; /* True if we're rexmits faster than usual */
 
        /* Track if RA was configured by BGP or by the Operator or both */
@@ -285,7 +292,7 @@ struct zebra_if {
         * we will use this list to update the nexthops
         * pointing to it with that info.
         */
-       struct nhg_connected_head nhg_dependents;
+       struct nhg_connected_tree_head nhg_dependents;
 
        /* Information about up/down changes */
        unsigned int up_count;