X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=4a0cbe9df093b86e4f95a5b41d493819c0bbc1b5;hp=f8478ad698a9f0609c4a08ff7be14063113594d9;hb=bb99e8017b5b99e5ccd2c05c11b516b6e629ab20;hpb=8db8cbbb449ff1f2fd010846061cd2799aef3b43

diff --git a/bridge.c b/bridge.c
index f8478ad..4a0cbe9 100644
--- a/bridge.c
+++ b/bridge.c
@@ -32,6 +32,8 @@ enum {
 	BRIDGE_ATTR_HELLO_TIME,
 	BRIDGE_ATTR_MAX_AGE,
 	BRIDGE_ATTR_BRIDGE_EMPTY,
+	BRIDGE_ATTR_MULTICAST_QUERIER,
+	BRIDGE_ATTR_HASH_MAX,
 	__BRIDGE_ATTR_MAX
 };
 
@@ -45,6 +47,8 @@ static const struct blobmsg_policy bridge_attrs[__BRIDGE_ATTR_MAX] = {
 	[BRIDGE_ATTR_MAX_AGE] = { "max_age", BLOBMSG_TYPE_INT32 },
 	[BRIDGE_ATTR_IGMP_SNOOP] = { "igmp_snooping", BLOBMSG_TYPE_BOOL },
 	[BRIDGE_ATTR_BRIDGE_EMPTY] = { "bridge_empty", BLOBMSG_TYPE_BOOL },
+	[BRIDGE_ATTR_MULTICAST_QUERIER] = { "multicast_querier", BLOBMSG_TYPE_BOOL },
+	[BRIDGE_ATTR_HASH_MAX] = { "hash_max", BLOBMSG_TYPE_INT32 },
 };
 
 static const struct uci_blob_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = {
@@ -295,7 +299,7 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
 			 * bridge mtu is set
 			 */
 			system_if_apply_settings(&bst->dev, &bst->dev.settings,
-						 DEV_OPT_MTU);
+						 DEV_OPT_MTU | DEV_OPT_MTU6);
 		}
 
 		break;
@@ -491,6 +495,7 @@ bridge_free(struct device *dev)
 
 	bst = container_of(dev, struct bridge_state, dev);
 	vlist_flush_all(&bst->members);
+	free(bst->config_data);
 	free(bst);
 }
 
@@ -547,6 +552,8 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	cfg->stp = false;
 	cfg->forward_delay = 2;
 	cfg->igmp_snoop = true;
+	cfg->multicast_querier = true;
+	cfg->hash_max = 512;
 	cfg->bridge_empty = false;
 	cfg->priority = 0x7FFF;
 
@@ -560,7 +567,13 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 		cfg->priority = blobmsg_get_u32(cur);
 
 	if ((cur = tb[BRIDGE_ATTR_IGMP_SNOOP]))
-		cfg->igmp_snoop = blobmsg_get_bool(cur);
+		cfg->multicast_querier = cfg->igmp_snoop = blobmsg_get_bool(cur);
+
+	if ((cur = tb[BRIDGE_ATTR_MULTICAST_QUERIER]))
+		cfg->multicast_querier = blobmsg_get_bool(cur);
+
+	if ((cur = tb[BRIDGE_ATTR_HASH_MAX]))
+		cfg->hash_max = blobmsg_get_u32(cur);
 
 	if ((cur = tb[BRIDGE_ATTR_AGEING_TIME])) {
 		cfg->ageing_time = blobmsg_get_u32(cur);
@@ -594,6 +607,7 @@ bridge_reload(struct device *dev, struct blob_attr *attr)
 	BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
 
 	bst = container_of(dev, struct bridge_state, dev);
+	attr = blob_memdup(attr);
 
 	blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
 		blob_data(attr), blob_len(attr));
@@ -613,7 +627,7 @@ bridge_reload(struct device *dev, struct blob_attr *attr)
 
 		diff = 0;
 		uci_blob_diff(tb_dev, otb_dev, &device_attr_list, &diff);
-		if (diff & ~(1 << DEV_ATTR_IFNAME))
+		if (diff)
 		    ret = DEV_CONFIG_RESTART;
 
 		blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, otb_br,
@@ -627,6 +641,7 @@ bridge_reload(struct device *dev, struct blob_attr *attr)
 		bridge_config_init(dev);
 	}
 
+	free(bst->config_data);
 	bst->config_data = attr;
 	return ret;
 }