pimd: Remove extraneous include of version.h

[mirror_frr.git] / ripngd / ripng_route.h

diff --git a/ripngd/ripng_route.h b/ripngd/ripng_route.h
index 3db1279b5c919efa28fd67d01cc333a561e79fb3..afc1d1cbc533714be9e4d52816b34a0ba430b9c7 100644 (file)
--- a/ripngd/ripng_route.h
+++ b/ripngd/ripng_route.h
@@ -30,26 +30,26 @@ struct ripng_aggregate {
        unsigned int suppress;
 
        /* Metric of this route.  */
-       u_char metric;
+       uint8_t metric;
 
        /* Tag field of RIPng packet.*/
-       u_int16_t tag;
+       uint16_t tag;
 
        /* Route-map futures - this variables can be changed. */
        struct in6_addr nexthop_out;
-       u_char metric_set;
-       u_char metric_out;
-       u_int16_t tag_out;
+       uint8_t metric_set;
+       uint8_t metric_out;
+       uint16_t tag_out;
 };
 
-extern void ripng_aggregate_increment(struct route_node *rp,
+extern void ripng_aggregate_increment(struct agg_node *rp,
                                      struct ripng_info *rinfo);
-extern void ripng_aggregate_decrement(struct route_node *rp,
+extern void ripng_aggregate_decrement(struct agg_node *rp,
                                      struct ripng_info *rinfo);
-extern void ripng_aggregate_decrement_list(struct route_node *rp,
+extern void ripng_aggregate_decrement_list(struct agg_node *rp,
                                           struct list *list);
-extern int ripng_aggregate_add(struct prefix *p);
-extern int ripng_aggregate_delete(struct prefix *p);
+extern int ripng_aggregate_add(struct ripng *ripng, struct prefix *p);
+extern int ripng_aggregate_delete(struct ripng *ripng, struct prefix *p);
 extern void ripng_aggregate_free(struct ripng_aggregate *aggregate);
 
 #endif /* _ZEBRA_RIPNG_ROUTE_H */