]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
bonding: Fix slave selection bug.
authorHillf Danton <dhillf@gmail.com>
Fri, 10 Dec 2010 18:54:11 +0000 (18:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Dec 2010 20:24:02 +0000 (12:24 -0800)
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>
drivers/net/bonding/bonding.h

index c2f081352a037894d6e8238ccb70c39e796c4a69..4feeb2d650a4f478bc6ab4f3c70db3f3563c622d 100644 (file)
@@ -269,11 +269,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)