Merge pull request #4365 from adharkar/frr-master-fpm_rtm_table

[mirror_frr.git] / zebra / zebra_router.h

diff --git a/zebra/zebra_router.h b/zebra/zebra_router.h
index c1f07397d02df962dbff18d44c6bae92573f4207..b3def297ac6bfdc59ce9da411df71da36fde8295 100644 (file)
--- a/zebra/zebra_router.h
+++ b/zebra/zebra_router.h
@@ -82,8 +82,9 @@ struct zebra_router {
 
        struct hash *iptable_hash;
 
-       /* used if vrf backend is not network namespace */
-       int rtadv_sock;
+#if defined(HAVE_RTADV)
+       struct rtadv rtadv;
+#endif /* HAVE_RTADV */
 
        /* A sequence number used for tracking routes */
        _Atomic uint32_t sequence_num;
@@ -109,6 +110,8 @@ struct zebra_router {
         * The EVPN instance, if any
         */
        struct zebra_vrf *evpn_vrf;
+
+       uint32_t multipath_num;
 };
 
 extern struct zebra_router zrouter;
@@ -127,8 +130,6 @@ extern void zebra_router_release_table(struct zebra_vrf *zvrf, uint32_t tableid,
 
 extern int zebra_router_config_write(struct vty *vty);
 
-extern unsigned long zebra_router_score_proto(uint8_t proto,
-                                             unsigned short instance);
 extern void zebra_router_sweep_route(void);
 
 extern void zebra_router_show_table_summary(struct vty *vty);