---

yaml --- r: 348016 b: refs/heads/master c: 9b1536c h: refs/heads/master v: v3
git-mirror · Dec 21, 2012 · 3a40b0c · 3a40b0c
1 parent c115395
commit 3a40b0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9650388b5c56578fdccc79c57a8c82fb92b8e7f1
+refs/heads/master: 9b1536c490d572f2ed4af0a15bd5d6cf349a9db4
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -366,11 +366,11 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 
 	err = netdev_set_master(dev, br->dev);
 	if (err)
-		goto err3;
+		goto err4;
 
 	err = netdev_rx_handler_register(dev, br_handle_frame, p);
 	if (err)
-		goto err4;
+		goto err5;
 
 	dev->priv_flags |= IFF_BRIDGE_PORT;
 
@@ -402,8 +402,10 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 
 	return 0;
 
-err4:
+err5:
 	netdev_set_master(dev, NULL);
+err4:
+	br_netpoll_disable(p);
 err3:
 	sysfs_remove_link(br->ifobj, p->dev->name);
 err2: