From: Hillf Danton <dhillf@gmail.com>
Date: Fri, 10 Dec 2010 18:54:11 +0000 (+0000)
Subject: bonding: Fix slave selection bug.
X-Git-Tag: v2.6.34.9~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a17efe35c72c510d8acf4da81aa5e2233b860281;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 257a7a4dfce98..d881eb830358a 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)