[ovs-dev] [PATCH 1/2] dpif-netdev: Don't use designated initializers.

[Gurucharan Shetty]

MSVC 2013 does not like designated initializers when
structs are initialized inside structs.

Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
 lib/dpif-netdev.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index b53d52a..86c4161 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -1826,11 +1826,12 @@ dp_netdev_flow_to_dpif_flow(const struct dp_netdev_flow 
*netdev_flow,
         struct flow_wildcards wc;
         struct dp_netdev_actions *actions;
         size_t offset;
-        struct odp_flow_key_parms odp_parms = {
-            .flow = &netdev_flow->flow,
-            .mask = &wc.masks,
-            .support = dp_netdev_support,
-        };
+        struct odp_flow_key_parms odp_parms;
+
+        memset(&odp_parms, 0, sizeof(odp_parms));
+        odp_parms.flow = &netdev_flow->flow;
+        odp_parms.mask = &wc.masks;
+        odp_parms.support = dp_netdev_support;
 
         miniflow_expand(&netdev_flow->cr.mask->mf, &wc.masks);
 
@@ -3030,12 +3031,13 @@ dp_netdev_upcall(struct dp_netdev_pmd_thread *pmd, 
struct dp_packet *packet_,
         struct ds ds = DS_EMPTY_INITIALIZER;
         char *packet_str;
         struct ofpbuf key;
-        struct odp_flow_key_parms odp_parms = {
-            .flow = flow,
-            .mask = &wc->masks,
-            .odp_in_port = flow->in_port.odp_port,
-            .support = dp_netdev_support,
-        };
+        struct odp_flow_key_parms odp_parms;
+
+        memset(&odp_parms, 0, sizeof(odp_parms));
+        odp_parms.flow = flow;
+        odp_parms.mask = &wc->masks;
+        odp_parms.odp_in_port = flow->in_port.odp_port;
+        odp_parms.support = dp_netdev_support;
 
         ofpbuf_init(&key, 0);
         odp_flow_key_from_flow(&odp_parms, &key);
-- 
1.7.9.5

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev