From: Roy Marples <roy@marples.name>
Date: Sun, 3 Mar 2019 22:43:00 +0000 (+0000)
Subject: IPv4LL: Fix compile with rbtree
X-Git-Tag: v8.0.0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef81cf77a977bd46919f37b10cd0d2b062d9b6db;p=thirdparty%2Fdhcpcd.git

IPv4LL: Fix compile with rbtree
---

diff --git a/src/ipv4ll.c b/src/ipv4ll.c
index 4d59fff2..673f583d 100644
--- a/src/ipv4ll.c
+++ b/src/ipv4ll.c
@@ -87,7 +87,7 @@ ipv4ll_pickaddr(struct arp_state *astate)
 }
 
 int
-ipv4ll_subnetroute(struct rt_head *routes, struct interface *ifp)
+ipv4ll_subnetroute(rb_tree_t *routes, struct interface *ifp)
 {
 	struct ipv4ll_state *state;
 	struct rt *rt;
@@ -108,12 +108,12 @@ ipv4ll_subnetroute(struct rt_head *routes, struct interface *ifp)
 	in.s_addr = INADDR_ANY;
 	sa_in_init(&rt->rt_gateway, &in);
 	sa_in_init(&rt->rt_ifa, &state->addr->addr);
-	TAILQ_INSERT_TAIL(routes, rt, rt_next);
+	rb_tree_insert_node(routes, rt);
 	return 1;
 }
 
 int
-ipv4ll_defaultroute(struct rt_head *routes, struct interface *ifp)
+ipv4ll_defaultroute(rb_tree_t *routes, struct interface *ifp)
 {
 	struct ipv4ll_state *state;
 	struct rt *rt;
@@ -132,7 +132,7 @@ ipv4ll_defaultroute(struct rt_head *routes, struct interface *ifp)
 	sa_in_init(&rt->rt_netmask, &in);
 	sa_in_init(&rt->rt_gateway, &in);
 	sa_in_init(&rt->rt_ifa, &state->addr->addr);
-	TAILQ_INSERT_TAIL(routes, rt, rt_next);
+	rb_tree_insert_node(routes, rt);
 	return 1;
 }
 
diff --git a/src/ipv4ll.h b/src/ipv4ll.h
index 23fad1b1..d823d604 100644
--- a/src/ipv4ll.h
+++ b/src/ipv4ll.h
@@ -58,8 +58,8 @@ struct ipv4ll_state {
 	(IPV4LL_CSTATE((ifp)) && !IPV4LL_CSTATE((ifp))->down &&		       \
 	(IPV4LL_CSTATE((ifp))->addr != NULL))
 
-int ipv4ll_subnetroute(struct rt_head *, struct interface *);
-int ipv4ll_defaultroute(struct rt_head *,struct interface *);
+int ipv4ll_subnetroute(rb_tree_t *, struct interface *);
+int ipv4ll_defaultroute(rb_tree_t *,struct interface *);
 ssize_t ipv4ll_env(char **, const char *, const struct interface *);
 void ipv4ll_start(void *);
 void ipv4ll_claimed(void *);