---

yaml --- r: 247965 b: refs/heads/master c: bb8ed63 h: refs/heads/master i: 247963: 0774a46 v: v3
git-mirror · May 23, 2011 · 00b8569 · 00b8569
1 parent 3e241a6
commit 00b8569
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d8fc29d02a33e4bd5f4fa47823c1fd386346093
+refs/heads/master: bb8ed6302b0613339c1a5f0a2cb0b3807c0af611
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -338,6 +338,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 	if (IS_ERR(p))
 		return PTR_ERR(p);
 
+	call_netdevice_notifiers(NETDEV_JOIN, dev);
+
 	err = dev_set_promiscuity(dev, 1);
 	if (err)
 		goto put_back;