MSVC 2013 does not like designated initializers when
structs are initialized inside structs.
Apparently it has been fixed in MSCV 2015.
Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
ovn/controller/ofctrl.c | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c
index bc4e8d4..ec0d868 100644
--- a/ovn/controller/ofctrl.c
+++ b/ovn/controller/ofctrl.c
@@ -401,12 +401,11 @@ ofctrl_update_flows(void)
if (!d) {
/* Installed flow is no longer desirable. Delete it from the
* switch and from installed_flows. */
- struct ofputil_flow_mod fm = {
- .match = i->match,
- .priority = i->priority,
- .table_id = i->table_id,
- .command = OFPFC_DELETE_STRICT,
- };
+ struct ofputil_flow_mod fm;
+ fm.match = i->match;
+ fm.priority = i->priority;
+ fm.table_id = i->table_id;
+ fm.command = OFPFC_DELETE_STRICT;
queue_flow_mod(&fm);
ovn_flow_log(i, "removing");
@@ -416,14 +415,13 @@ ofctrl_update_flows(void)
if (!ofpacts_equal(i->ofpacts, i->ofpacts_len,
d->ofpacts, d->ofpacts_len)) {
/* Update actions in installed flow. */
- struct ofputil_flow_mod fm = {
- .match = i->match,
- .priority = i->priority,
- .table_id = i->table_id,
- .ofpacts = d->ofpacts,
- .ofpacts_len = d->ofpacts_len,
- .command = OFPFC_MODIFY_STRICT,
- };
+ struct ofputil_flow_mod fm;
+ fm.match = i->match;
+ fm.priority = i->priority;
+ fm.table_id = i->table_id;
+ fm.ofpacts = d->ofpacts;
+ fm.ofpacts_len = d->ofpacts_len;
+ fm.command = OFPFC_MODIFY_STRICT;
queue_flow_mod(&fm);
ovn_flow_log(i, "updating");
@@ -446,14 +444,13 @@ ofctrl_update_flows(void)
struct ovn_flow *d;
HMAP_FOR_EACH_SAFE (d, next, hmap_node, &desired_flows) {
/* Send flow_mod to add flow. */
- struct ofputil_flow_mod fm = {
- .match = d->match,
- .priority = d->priority,
- .table_id = d->table_id,
- .ofpacts = d->ofpacts,
- .ofpacts_len = d->ofpacts_len,
- .command = OFPFC_ADD,
- };
+ struct ofputil_flow_mod fm;
+ fm.match = d->match;
+ fm.priority = d->priority;
+ fm.table_id = d->table_id;
+ fm.ofpacts = d->ofpacts;
+ fm.ofpacts_len = d->ofpacts_len;
+ fm.command = OFPFC_ADD;
queue_flow_mod(&fm);
ovn_flow_log(d, "adding");
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
