projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChangeLog: Rename NEWS.
[openvswitch]
/
lib
/
ofp-util.c
diff --git
a/lib/ofp-util.c
b/lib/ofp-util.c
index 2e62b9188e50f128d5f3b3a26dec649344fbfa3c..df3377ae90e9315310d6934f0354a0189e1ed34e 100644
(file)
--- a/
lib/ofp-util.c
+++ b/
lib/ofp-util.c
@@
-2039,8
+2039,9
@@
validate_actions(const union ofp_action *actions, size_t n_actions,
break;
case OFPUTIL_NXAST_BUNDLE:
break;
case OFPUTIL_NXAST_BUNDLE:
+ case OFPUTIL_NXAST_BUNDLE_LOAD:
error = bundle_check((const struct nx_action_bundle *) a,
error = bundle_check((const struct nx_action_bundle *) a,
- max_ports);
+ max_ports
, flow
);
break;
case OFPUTIL_OFPAT_STRIP_VLAN:
break;
case OFPUTIL_OFPAT_STRIP_VLAN:
@@
-2116,6
+2117,7
@@
static const struct ofputil_nxast_action nxast_actions[] = {
{ OFPUTIL_NXAST_MULTIPATH, 32, 32 },
{ OFPUTIL_NXAST_AUTOPATH, 24, 24 },
{ OFPUTIL_NXAST_BUNDLE, 32, UINT_MAX },
{ OFPUTIL_NXAST_MULTIPATH, 32, 32 },
{ OFPUTIL_NXAST_AUTOPATH, 24, 24 },
{ OFPUTIL_NXAST_BUNDLE, 32, UINT_MAX },
+ { OFPUTIL_NXAST_BUNDLE_LOAD, 32, UINT_MAX },
};
static int
};
static int