diff options
| author | Mark Stapp <mjs@voltanet.io> | 2019-11-21 15:05:52 -0500 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2019-11-21 15:05:52 -0500 |
| commit | 5463ce26c35c875b56d507ac1b0e25b1f106cff5 (patch) | |
| tree | 2b6f5bf8ab1e32684b36d55432e7857e1f7155f9 /zebra/zebra_nhg.h | |
| parent | fb72308b9903898778ce3463a6193c0b9510ade0 (diff) | |
zebra: clean up rib and nhg headers
Clean up the relationships between zebra's rib and nexthop-group
headers as prep for adding a nexthop-group pointer to the
route_entry.
Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'zebra/zebra_nhg.h')
| -rw-r--r-- | zebra/zebra_nhg.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/zebra/zebra_nhg.h b/zebra/zebra_nhg.h index 1f695433c9..4aa433a9a7 100644 --- a/zebra/zebra_nhg.h +++ b/zebra/zebra_nhg.h @@ -23,11 +23,9 @@ #ifndef __ZEBRA_NHG_H__ #define __ZEBRA_NHG_H__ -#include "zebra/rib.h" +#include "lib/nexthop.h" #include "lib/nexthop_group.h" -#include "zebra/zebra_dplane.h" - /* This struct is used exclusively for dataplane * interaction via a dataplane context. * @@ -201,8 +199,6 @@ zebra_nhg_rib_find(uint32_t id, struct nexthop_group *nhg, afi_t rt_afi); /* Reference counter functions */ extern void zebra_nhg_decrement_ref(struct nhg_hash_entry *nhe); extern void zebra_nhg_increment_ref(struct nhg_hash_entry *nhe); -extern int zebra_nhg_re_update_ref(struct route_entry *re, - struct nhg_hash_entry *nhe); /* Check validity of nhe, if invalid will update dependents as well */ extern void zebra_nhg_check_valid(struct nhg_hash_entry *nhe); @@ -224,5 +220,6 @@ extern void zebra_nhg_dplane_result(struct zebra_dplane_ctx *ctx); extern void zebra_nhg_sweep_table(struct hash *hash); /* Nexthop resolution processing */ +struct route_entry; /* Forward ref to avoid circular includes */ extern int nexthop_active_update(struct route_node *rn, struct route_entry *re); #endif |