---

yaml --- r: 362655 b: refs/heads/master c: fc7a72a h: refs/heads/master i: 362653: 7c1da1f 362651: 9879138 362647: 8453aab 362639: 1316f52 362623: 1185774 v: v3
git-mirror · Apr 19, 2013 · 9cffd14 · 9cffd14
1 parent 4c346a4
commit 9cffd14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c5913b53fefc9d9e15a2d0f93042766658d9f3f
+refs/heads/master: fc7a72ac86e2956dd405b0c604fea45a2702f567
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -1920,6 +1920,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 		write_unlock_bh(&bond->curr_slave_lock);
 		read_unlock(&bond->lock);
 	}
+	slave_disable_netpoll(new_slave);
 
 err_close:
 	slave_dev->priv_flags &= ~IFF_BONDING;