git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bundle: Fix returned error code in one bundle_check() corner case.
[sliver-openvswitch.git]
/
lib
/
bundle.c
diff --git
a/lib/bundle.c
b/lib/bundle.c
index
227d359
..
e6e39a0
100644
(file)
--- a/
lib/bundle.c
+++ b/
lib/bundle.c
@@
-144,8
+144,8
@@
bundle_check(const struct nx_action_bundle *nab, int max_ports,
error = ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT);
}
error = ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT);
}
- if (subtype == NXAST_BUNDLE_LOAD) {
- error = nxm_dst_check(nab->dst, nab->ofs_nbits, 16, flow)
|| error
;
+ if (subtype == NXAST_BUNDLE_LOAD
&& !error
) {
+ error = nxm_dst_check(nab->dst, nab->ofs_nbits, 16, flow);
}
if (slaves_size < n_slaves * sizeof(ovs_be16)) {
}
if (slaves_size < n_slaves * sizeof(ovs_be16)) {