diff options
| author | Hillf Danton <dhillf@gmail.com> | 2010-12-10 18:54:11 +0000 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-04-17 16:16:03 -0400 |
| commit | a17efe35c72c510d8acf4da81aa5e2233b860281 (patch) | |
| tree | e2ca7950b340f5983fdf79ea48110fd89f3fab9f | |
| parent | 4beaa7e56f75121da2acd9bbc3b9b115db0323d5 (diff) | |
bonding: Fix slave selection bug.
commit af3e5bd5f650163c2e12297f572910a1af1b8236 upstream
The returned slave is incorrect, if the net device under check is not
charged yet by the master.
Signed-off-by: Hillf Danton <dhillf@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | drivers/net/bonding/bonding.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 257a7a4dfce..d881eb83035 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -235,11 +235,11 @@ static inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct n bond_for_each_slave(bond, slave, i) { if (slave->dev == slave_dev) { - break; + return slave; } } - return slave; + return 0; } static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) |