zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / pimd / pim_nht.h

diff --git a/pimd/pim_nht.h b/pimd/pim_nht.h
index 72ed777bf77ebeea4501011d1db2aa2684224fea..796fbf9731943f2ca58278527ba516341455d630 100644 (file)
--- a/pimd/pim_nht.h
+++ b/pimd/pim_nht.h
@@ -33,13 +33,13 @@
 struct pim_nexthop_cache {
        struct pim_rpf rpf;
        /* IGP route's metric. */
-       u_int32_t metric;
+       uint32_t metric;
        uint32_t distance;
        /* Nexthop number and nexthop linked list. */
-       u_char nexthop_num;
+       uint8_t nexthop_num;
        struct nexthop *nexthop;
        int64_t last_update;
-       u_int16_t flags;
+       uint16_t flags;
 #define PIM_NEXTHOP_VALID             (1 << 0)
 
        struct list *rp_list;
@@ -61,13 +61,11 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
                            struct pim_nexthop *nexthop, struct prefix *src,
                            struct prefix *grp, int neighbor_needed);
 int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
-                           struct pim_nexthop *nexthop, struct in_addr addr,
-                           struct prefix *src, struct prefix *grp,
-                           int neighbor_needed);
+                           struct pim_nexthop *nexthop, struct prefix *src,
+                           struct prefix *grp, int neighbor_needed);
 void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient,
                           struct pim_nexthop_cache *pnc, int command);
 void pim_resolve_upstream_nh(struct pim_instance *pim, struct prefix *nht_p);
 int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
-                                    struct in_addr addr, struct prefix *src,
-                                    struct prefix *grp);
+                                    struct prefix *src, struct prefix *grp);
 #endif