projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Replace 'minor' by 'dp_idx'.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index 5675f8974738f674249dba772b2a3784e80068c9..c38c8123669f91f7284596c41b24e221e9ef5e48 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-260,7
+260,7
@@
do_switching(struct switch_ *sw)
static void
read_flow_file(const char *name)
{
static void
read_flow_file(const char *name)
{
-
struct ofpbuf *b
;
+
enum nx_flow_format flow_format
;
FILE *stream;
stream = fopen(optarg, "r");
FILE *stream;
stream = fopen(optarg, "r");
@@
-268,8
+268,9
@@
read_flow_file(const char *name)
ovs_fatal(errno, "%s: open", name);
}
ovs_fatal(errno, "%s: open", name);
}
- while ((b = parse_ofp_add_flow_file(stream)) != NULL) {
- list_push_back(&default_flows, &b->list_node);
+ flow_format = NXFF_OPENFLOW10;
+ while (parse_ofp_add_flow_file(&default_flows, &flow_format, stream)) {
+ continue;
}
fclose(stream);
}
fclose(stream);