X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=892631d4e25ec3b82457dac94b7be25b1f0e2e31;hp=99f654048e2a5cf67c4aa81faadbd751942133ca;hb=f04430a371c2628193ced7dd1ff1a0f0dd01e70d;hpb=94c8619d72e65b36aa2a6f5b8157bc479f252473

diff --git a/interface-ip.c b/interface-ip.c
index 99f6540..892631d 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -525,11 +525,10 @@ interface_ip_set_prefix_assignment(struct device_prefix *prefix,
 	struct device_prefix_assignment *assignment;
 
 	if (!length || length > 64) {
-		assignment = vlist_find(prefix->assignments, &iface, assignment, node);
+		assignment = vlist_find(prefix->assignments, iface->name, assignment, node);
 		if (assignment)
 			interface_set_prefix_address(iface, false, assignment);
 	} else {
-		uint8_t length = iface->proto_ip.assignment_length;
 		uint64_t want = 1ULL << (64 - length);
 		char *name;
 
@@ -576,9 +575,11 @@ interface_update_prefix(struct vlist_tree *tree,
 		// Update all assignments
 		struct device_prefix_assignment *assignment;
 		struct vlist_tree *assignments = prefix_new->assignments;
-		vlist_for_each_element(assignments, assignment, node)
+		vlist_for_each_element(assignments, assignment, node) {
+			assignment->prefix = prefix_new;
 			assignments->update(assignments,
 					&assignment->node, &assignment->node);
+		}
 	} else if (node_new) {
 		prefix_new->avail = 1ULL << (64 - prefix_new->length);
 		prefix_new->assignments = calloc(1, sizeof(*prefix_new->assignments));
@@ -591,8 +592,6 @@ interface_update_prefix(struct vlist_tree *tree,
 			interface_ip_set_prefix_assignment(prefix_new, iface,
 					iface->proto_ip.assignment_length);
 
-		list_add(&prefix_new->head, &prefixes);
-
 		// Set null-route to avoid routing loops
 		system_add_route(NULL, &route);
 	}
@@ -609,6 +608,9 @@ interface_update_prefix(struct vlist_tree *tree,
 		}
 		free(prefix_old);
 	}
+
+	if (node_new)
+		list_add(&prefix_new->head, &prefixes);
 }
 
 void