---

yaml --- r: 218474 b: refs/heads/master c: a71fb88 h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · 9d14756 · 9d14756
1 parent b10fa26
commit 9d14756
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74b0b85b88aaa952023762e0280799aaae849841
+refs/heads/master: a71fb88145a03678fef3796930993e390db68a15
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -493,9 +493,9 @@ static void bond_vlan_rx_register(struct net_device *bond_dev,
 	struct slave *slave;
 	int i;
 
-	write_lock(&bond->lock);
+	write_lock_bh(&bond->lock);
 	bond->vlgrp = grp;
-	write_unlock(&bond->lock);
+	write_unlock_bh(&bond->lock);
 
 	bond_for_each_slave(bond, slave, i) {
 		struct net_device *slave_dev = slave->dev;