---

yaml --- r: 170477 b: refs/heads/master c: 49b4ad9 h: refs/heads/master i: 170475: 566526b v: v3
git-mirror · Oct 7, 2009 · 2ca4c44 · 2ca4c44
1 parent 21c996b
commit 2ca4c44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c6aaa24613cbd56f853363e3ce00091a9d2eac8
+refs/heads/master: 49b4ad92d1a5bb9909deb3216ffec6f0febc7b71
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -1119,7 +1119,7 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
 	int mintime = bond->params.updelay;
 	int i;
 
-	new_active = old_active = bond->curr_active_slave;
+	new_active = bond->curr_active_slave;
 
 	if (!new_active) { /* there were no active slaves left */
 		if (bond->slave_cnt > 0)   /* found one slave */