From: Roy Marples <roy@marples.name>
Date: Wed, 8 Jul 2020 11:36:36 +0000 (+0100)
Subject: Fix prior
X-Git-Tag: v9.2.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb5a864122c3be0b1ce20dae79f6945555a65aa1;p=thirdparty%2Fdhcpcd.git

Fix prior
---

diff --git a/src/ipv4ll.c b/src/ipv4ll.c
index ae1355ad..fee115f2 100644
--- a/src/ipv4ll.c
+++ b/src/ipv4ll.c
@@ -111,7 +111,7 @@ ipv4ll_subnetroute(rb_tree_t *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);
-	rt->rt_flags |= RTDF_IPV4LL;
+	rt->rt_dflags |= RTDF_IPV4LL;
 	return rt_proto_add(routes, rt) ? 1 : 0;
 }
 
@@ -135,7 +135,7 @@ ipv4ll_defaultroute(rb_tree_t *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);
-	rt->rt_flags |= RTDF_IPV4LL;
+	rt->rt_dflags |= RTDF_IPV4LL;
 #ifdef HAVE_ROUTE_METRIC
 	rt->rt_metric += 10000;
 #endif
diff --git a/src/route.c b/src/route.c
index c7009c19..83bc37c7 100644
--- a/src/route.c
+++ b/src/route.c
@@ -170,9 +170,9 @@ rt_compare_proto(void *context, const void *node1, const void *node2)
 
 #ifdef INET
 	/* IPv4LL routes always come last */
-	if (rt1->rt_flags & RTDF_IPV4LL && !(rt2->rt_flags & RTDF_IPV4LL))
+	if (rt1->rt_dflags & RTDF_IPV4LL && !(rt2->rt_dflags & RTDF_IPV4LL))
 		return -1;
-	else if (!(rt1->rt_flags & RTDF_IPV4LL) && rt2->rt_flags & RTDF_IPV4LL)
+	else if (!(rt1->rt_dflags & RTDF_IPV4LL) && rt2->rt_dflags & RTDF_IPV4LL)
 		return 1;
 #endif