From 2ca4c44fc1e2ee6d397d9f318f8d6b1fc1fc687f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20de=20Peslo=C3=BCan?= Date: Wed, 7 Oct 2009 14:11:00 -0700 Subject: [PATCH] --- yaml --- r: 170477 b: refs/heads/master c: 49b4ad92d1a5bb9909deb3216ffec6f0febc7b71 h: refs/heads/master i: 170475: 566526babaf4b1e15236e28d5cfd2a635248c2a1 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a66fa19aa49c..d552b2179d44 100644 --- 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 index 05877cb182e7..ef6af1cb7d39 100644 --- 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 */