X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=bridge.c;h=ce22b754f4d3f9512da2bb9f7ac1f1d7de964e56;hb=26cb3b2a0aebb1b9dc07daf7b54bd8400d6d659b;hp=4ef0d7e20940587e324291c6a1df45ef926d2298;hpb=edeaec0b8752bbadeb5b94c2b238e07dc4a1b4e4;p=project%2Fnetifd.git

diff --git a/bridge.c b/bridge.c
index 4ef0d7e..ce22b75 100644
--- a/bridge.c
+++ b/bridge.c
@@ -140,6 +140,8 @@ bridge_disable_member(struct bridge_member *bm)
 	system_bridge_delif(&bst->dev, bm->dev.dev);
 	device_release(&bm->dev);
 
+	device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE);
+
 	return 0;
 }
 
@@ -152,6 +154,12 @@ bridge_enable_member(struct bridge_member *bm)
 	if (!bm->present)
 		return 0;
 
+	/* Disable IPv6 for bridge members */
+	if (!(bm->dev.dev->settings.flags & DEV_OPT_IPV6)) {
+		bm->dev.dev->settings.ipv6 = 0;
+		bm->dev.dev->settings.flags |= DEV_OPT_IPV6;
+	}
+
 	ret = device_claim(&bm->dev);
 	if (ret < 0)
 		goto error;
@@ -162,6 +170,8 @@ bridge_enable_member(struct bridge_member *bm)
 		goto error;
 	}
 
+	device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE);
+
 	return 0;
 
 error:
@@ -231,10 +241,17 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
 		bm->present = true;
 		bst->n_present++;
 
-		if (bst->dev.active)
-			bridge_enable_member(bm);
-		else if (bst->n_present == 1)
+		if (bst->n_present == 1)
 			device_set_present(&bst->dev, true);
+		if (bst->dev.active && !bridge_enable_member(bm)) {
+			/*
+			 * Adding a bridge member can overwrite the bridge mtu
+			 * in the kernel, apply the bridge settings in case the
+			 * bridge mtu is set
+			 */
+			system_if_apply_settings(&bst->dev, &bst->dev.settings,
+						 DEV_OPT_MTU);
+		}
 
 		break;
 	case DEV_EVENT_REMOVE:
@@ -327,7 +344,11 @@ bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
 	strcpy(bm->name, dev->ifname);
 	bm->dev.dev = dev;
 	vlist_add(&bst->members, &bm->node, bm->name);
-	if (hotplug)
+	// Need to look up the bridge member again as the above
+	// created pointer will be freed in case the bridge member
+	// already existed
+	bm = vlist_find(&bst->members, dev->ifname, bm, node);
+	if (hotplug && bm)
 		bm->node.version = -1;
 
 	return bm;
@@ -475,7 +496,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	/* defaults */
 	cfg->stp = false;
 	cfg->forward_delay = 2;
-	cfg->igmp_snoop = false;
+	cfg->igmp_snoop = true;
 	cfg->bridge_empty = false;
 	cfg->priority = 0x7FFF;