revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / net / bonding / bonding.h

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index c867cf901f9f60f9c58d2fd7e9f5e37b7f568d0a..c6fdd851579a77c953d259de7611c4298fec824f 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -240,11 +240,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) {
-                       return slave;
+                       break;
                }
        }
 
-       return 0;
+       return slave;
 }
 
 static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)