X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-ip.c;h=d5a3832bd4d4980155a9818f81ca14f7c5d948ce;hp=b1abbc60de4557edf5017f4f202077a78058b9d9;hb=f1e5b2292ea452af8d46267f4bbcc515841963ce;hpb=4d09244bc73a3b8bc8168366526e4ddded41057e

diff --git a/interface-ip.c b/interface-ip.c
index b1abbc6..d5a3832 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -322,7 +322,8 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 	if ((cur = tb[ROUTE_METRIC]) != NULL) {
 		route->metric = blobmsg_get_u32(cur);
 		route->flags |= DEVROUTE_METRIC;
-	}
+	} else
+		route->metric = iface->metric;
 
 	if ((cur = tb[ROUTE_MTU]) != NULL) {
 		route->mtu = blobmsg_get_u32(cur);
@@ -588,9 +589,6 @@ interface_update_proto_route(struct vlist_tree *tree,
 	if (node_new) {
 		bool _enabled = enable_route(ip, route_new);
 
-		if (!(route_new->flags & DEVROUTE_METRIC))
-			route_new->metric = iface->metric;
-
 		if (!(route_new->flags & DEVADDR_EXTERNAL) && !keep && _enabled)
 			if (system_add_route(dev, route_new))
 				route_new->failed = true;