X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=interface.c;h=f150f7d877ca210667f27f56eb6127b9f62fc805;hb=7e3b89a4d4c0b55a9b2376b88cbe72a1edc5cd82;hp=a014111aaadb4478ae9e2cdd978d2bc21d767028;hpb=b8ef742bd04ebef324ae11aee56c6e1d2cb7e0ad;p=project%2Fnetifd.git

diff --git a/interface.c b/interface.c
index a014111..f150f7d 100644
--- a/interface.c
+++ b/interface.c
@@ -46,6 +46,7 @@ enum {
 	IFACE_ATTR_DELEGATE,
 	IFACE_ATTR_IP6IFACEID,
 	IFACE_ATTR_FORCE_LINK,
+	IFACE_ATTR_IP6WEIGHT,
 	IFACE_ATTR_MAX
 };
 
@@ -68,6 +69,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_IP6IFACEID] = { .name = "ip6ifaceid", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_FORCE_LINK] = { .name = "force_link", .type = BLOBMSG_TYPE_BOOL },
+	[IFACE_ATTR_IP6WEIGHT] = { .name = "ip6weight", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list interface_attr_list = {
@@ -94,11 +96,11 @@ interface_error_flush(struct interface *iface)
 static void
 interface_clear_errors(struct interface *iface)
 {
-        /* don't flush the errors in case the configured protocol handler matches the
+	/* don't flush the errors in case the configured protocol handler matches the
            running protocol handler and is having the last error capability */
 	if (!(iface->proto &&
-              (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
-              (iface->proto->handler->name == iface->proto_handler->name)))
+	      (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+	      (iface->proto->handler->name == iface->proto_handler->name)))
 		interface_error_flush(iface);
 }
 
@@ -110,12 +112,12 @@ void interface_add_error(struct interface *iface, const char *subsystem,
 	int *datalen = NULL;
 	char *dest, *d_subsys, *d_code;
 
-        /* if the configured protocol handler has the last error support capability,
+	/* if the configured protocol handler has the last error support capability,
            errors should only be added if the running protocol handler matches the
            configured one */
 	if (iface->proto &&
-            (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
-            (iface->proto->handler->name != iface->proto_handler->name))
+	    (iface->proto->handler->flags & PROTO_FLAG_LASTERROR) &&
+	    (iface->proto->handler->name != iface->proto_handler->name))
 		return;
 
 	if (n_data) {
@@ -497,6 +499,7 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
 	bool changed = (old->assignment_hint != new->assignment_hint ||
 			old->assignment_length != new->assignment_length ||
 			old->assignment_iface_id_selection != new->assignment_iface_id_selection ||
+			old->assignment_weight != new->assignment_weight ||
 			(old->assignment_iface_id_selection == IFID_FIXED &&
 			 memcmp(&old->assignment_fixed_iface_id, &new->assignment_fixed_iface_id,
 				sizeof(old->assignment_fixed_iface_id))) ||
@@ -534,6 +537,7 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
 		old->assignment_length = new->assignment_length;
 		old->assignment_iface_id_selection = new->assignment_iface_id_selection;
 		old->assignment_fixed_iface_id = new->assignment_fixed_iface_id;
+		old->assignment_weight = new->assignment_weight;
 		interface_refresh_assignments(true);
 	}
 }
@@ -842,6 +846,8 @@ interface_alloc(const char *name, struct blob_attr *config)
 	if ((cur = tb[IFACE_ATTR_IP6CLASS]))
 		interface_add_assignment_classes(iface, cur);
 
+	if ((cur = tb[IFACE_ATTR_IP6WEIGHT]))
+		iface->assignment_weight = blobmsg_get_u32(cur);
 
 	if ((cur = tb[IFACE_ATTR_IP4TABLE])) {
 		if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip4table))