diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/net/bonding/bonding.h | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/net/bonding/bonding.h')
| -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 c6fdd851579a..c867cf901f9f 100644 --- 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 | |||
| 240 | 240 | ||
| 241 | bond_for_each_slave(bond, slave, i) { | 241 | bond_for_each_slave(bond, slave, i) { |
| 242 | if (slave->dev == slave_dev) { | 242 | if (slave->dev == slave_dev) { |
| 243 | break; | 243 | return slave; |
| 244 | } | 244 | } |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | return slave; | 247 | return 0; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) | 250 | static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) |