projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sFlow: add Sun Industry Standards Source License 1.1 as licensing option
[openvswitch]
/
lib
/
bundle.h
diff --git
a/lib/bundle.h
b/lib/bundle.h
index a202ade494c39d9cf49bd3efdd67142337553a61..12497f78801ad11601302bc66c185b15399ccb83 100644
(file)
--- a/
lib/bundle.h
+++ b/
lib/bundle.h
@@
-35,8
+35,13
@@
struct ofpbuf;
uint16_t bundle_execute(const struct nx_action_bundle *, const struct flow *,
bool (*slave_enabled)(uint16_t ofp_port, void *aux),
void *aux);
uint16_t bundle_execute(const struct nx_action_bundle *, const struct flow *,
bool (*slave_enabled)(uint16_t ofp_port, void *aux),
void *aux);
-int bundle_check(const struct nx_action_bundle *, int max_ports);
+void bundle_execute_load(const struct nx_action_bundle *, struct flow *,
+ bool (*slave_enabled)(uint16_t ofp_port, void *aux),
+ void *aux);
+int bundle_check(const struct nx_action_bundle *, int max_ports,
+ const struct flow *);
void bundle_parse(struct ofpbuf *, const char *);
void bundle_parse(struct ofpbuf *, const char *);
+void bundle_parse_load(struct ofpbuf *b, const char *);
void bundle_format(const struct nx_action_bundle *, struct ds *);
/* Returns the 'i'th slave in 'nab'. */
void bundle_format(const struct nx_action_bundle *, struct ds *);
/* Returns the 'i'th slave in 'nab'. */