]> git.proxmox.com Git - mirror_ovs.git/commitdiff
ofproto: Fix build with some GCC versions.
authorBen Pfaff <blp@ovn.org>
Wed, 26 Sep 2018 23:11:40 +0000 (16:11 -0700)
committerBen Pfaff <blp@ovn.org>
Thu, 27 Sep 2018 17:20:04 +0000 (10:20 -0700)
GCC 4.8.x and possibly other versions don't like a designated initializer
for an anonymous struct, see e.g.
https://travis-ci.org/openvswitch/ovs/jobs/433747674

Fixes: f836888d28ec ("ofproto: Handle OpenFlow version mismatch for requestforward with groups.")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
ofproto/ofproto.c

index a8cc4751f8c9700d6ee15ffe82a72c3bf3de6b46..0f8d74747851476127d14b2349ac47c627ce2ff2 100644 (file)
@@ -7393,13 +7393,12 @@ ofproto_group_mod_finish(struct ofproto *ofproto,
     remove_groups_postponed(&ogm->old_groups);
 
     if (req) {
-        struct ofputil_requestforward rf = {
-            .xid = req->request->xid,
-            .reason = OFPRFR_GROUP_MOD,
-            .group_mod = &ogm->gm,
-            .new_buckets = new_group ? &new_group->buckets : NULL,
-            .group_existed = group_collection_n(&ogm->old_groups) > 0,
-        };
+        struct ofputil_requestforward rf;
+        rf.xid = req->request->xid;
+        rf.reason = OFPRFR_GROUP_MOD;
+        rf.group_mod = &ogm->gm;
+        rf.new_buckets = new_group ? &new_group->buckets : NULL;
+        rf.group_existed = group_collection_n(&ogm->old_groups) > 0;
         connmgr_send_requestforward(ofproto->connmgr, req->ofconn, &rf);
     }
 }