projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Correct location of xen-bugtool plugins.
[openvswitch]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index d7c88b682c63cc83acfc47106f9369a14b037cb4..164d0830f6b2803ce048ad5d8542fd819a8ebe6d 100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-534,7
+534,7
@@
static void
do_dump_flows__(int argc, char *argv[], bool aggregate)
{
enum nx_flow_format min_flow_format, flow_format;
do_dump_flows__(int argc, char *argv[], bool aggregate)
{
enum nx_flow_format min_flow_format, flow_format;
- struct flow_stats_request fsr;
+ struct
ofputil_
flow_stats_request fsr;
struct ofpbuf *request;
struct vconn *vconn;
struct ofpbuf *request;
struct vconn *vconn;
@@
-1041,8
+1041,8
@@
read_flows_from_file(const char *filename, struct classifier *cls, int index)
min_flow_format = NXFF_OPENFLOW10;
while (!ds_get_preprocessed_line(&s, file)) {
struct fte_version *version;
min_flow_format = NXFF_OPENFLOW10;
while (!ds_get_preprocessed_line(&s, file)) {
struct fte_version *version;
+ struct ofputil_flow_mod fm;
enum nx_flow_format min_ff;
enum nx_flow_format min_ff;
- struct flow_mod fm;
parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true);
parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true);
@@
-1076,7
+1076,7
@@
static void
read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format,
struct classifier *cls, int index)
{
read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format,
struct classifier *cls, int index)
{
- struct flow_stats_request fsr;
+ struct
ofputil_
flow_stats_request fsr;
struct ofpbuf *request;
ovs_be32 send_xid;
bool done;
struct ofpbuf *request;
ovs_be32 send_xid;
bool done;
@@
-1152,7
+1152,7
@@
fte_make_flow_mod(const struct fte *fte, int index, uint16_t command,
enum nx_flow_format flow_format, struct list *packets)
{
const struct fte_version *version = fte->versions[index];
enum nx_flow_format flow_format, struct list *packets)
{
const struct fte_version *version = fte->versions[index];
- struct flow_mod fm;
+ struct
ofputil_
flow_mod fm;
struct ofpbuf *ofm;
fm.cr = fte->rule;
struct ofpbuf *ofm;
fm.cr = fte->rule;