diff options
author | Alex Wang <alexw@nicira.com> | 2013-08-12 14:14:52 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2013-08-12 14:01:23 -0700 |
commit | b5d5d7d33219225e050cc59b1785f2b6f40e8bd9 (patch) | |
tree | 97968cc7595d2f1ed1258784db97a6afc4a911ea /lib/bond.c | |
parent | 5d389d55c78a20bd18b68b35f0e6cabae2686dcb (diff) |
band: Fix error in bond_choose_output_slave() function.
This commit fixes the error introduced by commit 4a1b8f30e59 (bond:
Stop using tags.). The error is caused by mistakenly returning 'slave'
where 'slave->aux' should be returned.
Signed-off-by: Alex Wang <alexw@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/bond.c')
-rw-r--r-- | lib/bond.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -661,11 +661,14 @@ bond_choose_output_slave(struct bond *bond, const struct flow *flow, struct flow_wildcards *wc, uint16_t vlan) { struct bond_slave *slave; + void *aux; ovs_rwlock_rdlock(&rwlock); slave = choose_output_slave(bond, flow, wc, vlan); + aux = slave ? slave->aux : NULL; ovs_rwlock_unlock(&rwlock); - return slave; + + return aux; } /* Rebalancing. */ |