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
Merge "master" into "wdp".
[sliver-openvswitch.git]
/
lib
/
ofp-parse.h
diff --git
a/lib/ofp-parse.h
b/lib/ofp-parse.h
index
ac8e6d2
..
7a44f0b
100644
(file)
--- a/
lib/ofp-parse.h
+++ b/
lib/ofp-parse.h
@@
-30,7
+30,7
@@
void parse_ofp_str(char *string, struct ofp_match *match,
uint16_t *out_port, uint16_t *priority,
uint16_t *idle_timeout, uint16_t *hard_timeout,
uint64_t *cookie);
uint16_t *out_port, uint16_t *priority,
uint16_t *idle_timeout, uint16_t *hard_timeout,
uint64_t *cookie);
-struct ofpbuf *parse_ofp_add_flow_str(char *string);
-struct ofpbuf *parse_ofp_add_flow_file(FILE *);
+struct ofpbuf *parse_ofp_add_flow_str(char *string
, uint8_t *table_idx
);
+struct ofpbuf *parse_ofp_add_flow_file(FILE *
, uint8_t *table_idx
);
#endif /* ofp-parse.h */
#endif /* ofp-parse.h */