match: Fix compile of match initializer on GCC 4.6.1.
authorJustin Pettit <jpettit@nicira.com>
Wed, 6 May 2015 22:25:36 +0000 (15:25 -0700)
committerJustin Pettit <jpettit@nicira.com>
Thu, 7 May 2015 01:40:43 +0000 (18:40 -0700)
GCC 4.6.1 complained about the match structure not being properly
initialzed when using MATCH_CATCHALL_INITIALIZER macro.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Russell Bryant <rbryant@redhat.com>
lib/match.h

index 638c49d..10aa0af 100644 (file)
@@ -36,7 +36,7 @@ struct match {
 };
 
 /* Initializer for a "struct match" that matches every packet. */
-#define MATCH_CATCHALL_INITIALIZER { .flow.dl_type = 0 }
+#define MATCH_CATCHALL_INITIALIZER { .flow = { .dl_type = 0 } }
 
 void match_init(struct match *,
                 const struct flow *, const struct flow_wildcards *);